From ffdd1fe74fd07cfc7659aa58d3e84123b379bcfe Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Thu, 27 Jul 2023 02:41:52 +0300
Subject: [PATCH] add `random` to all emoji classes

---
 files/helpers/sanitize.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 64389b18a..c60e9ffe3 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -7,6 +7,8 @@ from os import path, listdir
 from typing import Any
 from urllib.parse import parse_qs, urlparse, unquote
 
+from sqlalchemy.sql import func
+
 import bleach
 from bleach.css_sanitizer import CSSSanitizer
 from bleach.linkifier import LinkifyFilter
@@ -234,7 +236,16 @@ def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
 
 		old = emoji
 		emoji = emoji.replace('!','').replace('#','')
-		if emoji == 'marseyrandom': emoji = random.choice(marseys_const2)
+
+		if emoji.endswith('random'):
+			kind = emoji.split('random')[0].title()
+			if kind == 'Donkeykong': kind = 'Donkey Kong'
+			elif kind == 'Marseyflag': kind = 'Marsey Flags'
+			elif kind == 'Marseyalphabet': kind = 'Marsey Alphabet'
+
+			if kind in EMOJI_KINDS:
+				emoji = g.db.query(Emoji.name).filter_by(kind=kind).order_by(func.random()).first()[0]
+
 
 		emoji_partial_pat = '<img alt=":{0}:" loading="lazy" src="{1}"{2}>'
 		emoji_partial = '<img alt=":{0}:" data-bs-toggle="tooltip" loading="lazy" src="{1}" title=":{0}:"{2}>'