diff --git a/files/assets/fonts/MarseyFont.woff2 b/files/assets/fonts/MarseyFont.woff2
new file mode 100644
index 000000000..4eba1a615
Binary files /dev/null and b/files/assets/fonts/MarseyFont.woff2 differ
diff --git a/files/assets/images/emojis/marseybbc.webp b/files/assets/images/emojis/marseybbc.webp
new file mode 100644
index 000000000..e19971438
Binary files /dev/null and b/files/assets/images/emojis/marseybbc.webp differ
diff --git a/files/assets/images/emojis/marseybrofist.webp b/files/assets/images/emojis/marseybrofist.webp
new file mode 100644
index 000000000..93934a8f6
Binary files /dev/null and b/files/assets/images/emojis/marseybrofist.webp differ
diff --git a/files/assets/images/emojis/marseychingchongshooter.webp b/files/assets/images/emojis/marseychingchongshooter.webp
new file mode 100644
index 000000000..9bc599ca4
Binary files /dev/null and b/files/assets/images/emojis/marseychingchongshooter.webp differ
diff --git a/files/assets/images/emojis/marseychudblush.webp b/files/assets/images/emojis/marseychudblush.webp
new file mode 100644
index 000000000..341d14378
Binary files /dev/null and b/files/assets/images/emojis/marseychudblush.webp differ
diff --git a/files/assets/images/emojis/marseydimitri.webp b/files/assets/images/emojis/marseydimitri.webp
new file mode 100644
index 000000000..456b167e1
Binary files /dev/null and b/files/assets/images/emojis/marseydimitri.webp differ
diff --git a/files/assets/images/emojis/marseyevil.webp b/files/assets/images/emojis/marseyevil.webp
new file mode 100644
index 000000000..80b0593fe
Binary files /dev/null and b/files/assets/images/emojis/marseyevil.webp differ
diff --git a/files/assets/images/emojis/marseyhissing.webp b/files/assets/images/emojis/marseyhissing.webp
new file mode 100644
index 000000000..470292d31
Binary files /dev/null and b/files/assets/images/emojis/marseyhissing.webp differ
diff --git a/files/assets/images/emojis/marseymonstercocklaugh.webp b/files/assets/images/emojis/marseymonstercocklaugh.webp
new file mode 100644
index 000000000..99392a6ca
Binary files /dev/null and b/files/assets/images/emojis/marseymonstercocklaugh.webp differ
diff --git a/files/assets/images/emojis/marseypicrew.webp b/files/assets/images/emojis/marseypicrew.webp
new file mode 100644
index 000000000..005e9eadc
Binary files /dev/null and b/files/assets/images/emojis/marseypicrew.webp differ
diff --git a/files/assets/images/emojis/marseypicrewwpd.webp b/files/assets/images/emojis/marseypicrewwpd.webp
new file mode 100644
index 000000000..286975f04
Binary files /dev/null and b/files/assets/images/emojis/marseypicrewwpd.webp differ
diff --git a/files/assets/images/emojis/marseypizzarentfree.webp b/files/assets/images/emojis/marseypizzarentfree.webp
new file mode 100644
index 000000000..60421de61
Binary files /dev/null and b/files/assets/images/emojis/marseypizzarentfree.webp differ
diff --git a/files/assets/images/emojis/marseyplatymerchant.webp b/files/assets/images/emojis/marseyplatymerchant.webp
new file mode 100644
index 000000000..9c592f608
Binary files /dev/null and b/files/assets/images/emojis/marseyplatymerchant.webp differ
diff --git a/files/assets/images/emojis/marseyquagmire.webp b/files/assets/images/emojis/marseyquagmire.webp
new file mode 100644
index 000000000..4be7a91a1
Binary files /dev/null and b/files/assets/images/emojis/marseyquagmire.webp differ
diff --git a/files/assets/images/emojis/marseyraytraced.webp b/files/assets/images/emojis/marseyraytraced.webp
new file mode 100644
index 000000000..5fdffb537
Binary files /dev/null and b/files/assets/images/emojis/marseyraytraced.webp differ
diff --git a/files/assets/images/emojis/marseyrussianmutt.webp b/files/assets/images/emojis/marseyrussianmutt.webp
new file mode 100644
index 000000000..b73712fe8
Binary files /dev/null and b/files/assets/images/emojis/marseyrussianmutt.webp differ
diff --git a/files/assets/images/emojis/marseywomanmoment2.webp b/files/assets/images/emojis/marseywomanmoment2.webp
new file mode 100644
index 000000000..61da9701c
Binary files /dev/null and b/files/assets/images/emojis/marseywomanmoment2.webp differ
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index ef95632a0..e59314ef5 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -428,13 +428,14 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=True, count_marseys
if showmore:
# Insert a show more button if the text is too long or has too many paragraphs
+ CHARLIMIT = 3000
pos = 0
for _ in range(20):
pos = sanitized.find('
', pos + 4)
if pos < 0:
break
- if pos < 0 and len(sanitized) > 3000:
- pos = 2500
+ if (pos < 0 and len(sanitized) > CHARLIMIT) or pos > CHARLIMIT:
+ pos = CHARLIMIT - 500
if pos >= 0:
sanitized = (sanitized[:pos] +
showmore_regex.sub(r'\1\2',
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index b5d21a418..fe1a958d0 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -16,7 +16,7 @@