From 37c9307fc41a9a6041e26d14394523477f795815 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sat, 22 Jul 2023 13:10:27 +0300
Subject: [PATCH] better handling of large emojis in places where they're not
 allowed

---
 files/assets/css/main.css | 2 +-
 files/helpers/regex.py    | 1 -
 files/helpers/sanitize.py | 7 ++++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index befba97d7..cdca743d2 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5509,7 +5509,7 @@ input[type=radio] ~ .custom-control-label::before {
 	height: 60px;
 	width: 60px;
 }
-.bigemoji, .emoji-lg, img[alt^=":"][alt*="#"] {
+.bigemoji, .emoji-lg, img[alt^=":"][alt*="#"]:not([t]) {
 	height: 150px;
 	width: 150px;
 }
diff --git a/files/helpers/regex.py b/files/helpers/regex.py
index 02e965300..fc2766129 100644
--- a/files/helpers/regex.py
+++ b/files/helpers/regex.py
@@ -52,7 +52,6 @@ mute_regex = re.compile("\/mute @?([\w\-]{3,30}) ([0-9]+)", flags=re.A|re.I)
 
 emoji_regex = re.compile(f"<p>\s*(:[!#@\w\-]{{1,36}}:\s*)+<\/p>", flags=re.A)
 emoji_regex2 = re.compile(f'(?<!"):([!#@\w\-]{{1,36}}?):(?!([^<]*<\/(code|pre)>|[^`]*`))', flags=re.A)
-emoji_regex3 = re.compile(f'(?<!"):([!@\w\-]{{1,35}}?):', flags=re.A)
 
 snappy_url_regex = re.compile('<a href="(https?:\/\/.+?)".*?>(.+?)<\/a>', flags=re.A)
 snappy_youtube_regex = re.compile('<lite-youtube videoid="(.+?)" params="autoplay=1', flags=re.A)
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index c059101b1..c1d9bb03f 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -213,7 +213,7 @@ def execute_blackjack(v, target, body, kind):
 			send_repeatable_notification_duplicated(id, f"Blackjack by @{v.username}: {extra_info}")
 	return True
 
-def render_emoji(html, regexp, golden, emojis_used, b=False):
+def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
 	emojis = list(regexp.finditer(html))
 	captured = set()
 
@@ -224,6 +224,7 @@ def render_emoji(html, regexp, golden, emojis_used, b=False):
 		emoji = i.group(1).lower()
 		attrs = ''
 		if b: attrs += ' b'
+		if is_title: attrs += ' t'
 		if golden and len(emojis) <= 20 and ('marsey' in emoji or emoji in marseys_const2):
 			if random.random() < 0.0025: attrs += ' g'
 			elif random.random() < 0.00125: attrs += ' glow'
@@ -609,7 +610,7 @@ def allowed_attributes_emojis(tag, name, value):
 		if name == 'src' and value.startswith('/') and '\\' not in value: return True
 		if name == 'loading' and value == 'lazy': return True
 		if name == 'data-bs-toggle' and value == 'tooltip': return True
-		if name in {'g','glow'} and not value: return True
+		if name in {'g','glow','t'} and not value: return True
 		if name in {'alt','title'}: return True
 
 	if tag == 'span':
@@ -631,7 +632,7 @@ def filter_emojis_only(title, golden=True, count_emojis=False, graceful=False, s
 
 	emojis_used = set()
 
-	title = render_emoji(title, emoji_regex3, golden, emojis_used)
+	title = render_emoji(title, emoji_regex2, golden, emojis_used, is_title=True)
 
 	if count_emojis:
 		for emoji in g.db.query(Emoji).filter(Emoji.submitter_id==None, Emoji.name.in_(emojis_used)).all():