From 99eeb3ee4b5b58ddad30b469c9561774562d632c Mon Sep 17 00:00:00 2001 From: DrTransmisia <95589613+DrTransmisia@users.noreply.github.com> Date: Tue, 10 May 2022 02:58:57 +0200 Subject: [PATCH] Bussysussy (#256) * improved static emojis descriptions and file readability * perf improv. 2 * some minor tweaks * final tweaks to js and mobile css * very final --- files/routes/static.py | 4 ++-- files/templates/emoji_modal.html | 27 +++++++++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index cdffde3ec..bb0f4e6f2 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -35,9 +35,9 @@ def marsey_list(): # From database emojis = [{ "name": emoji.name, - "author": author if SITE_NAME == 'rDrama' else "rDrama's chads", + "author": author if SITE_NAME == 'rDrama' else None, # yikes, I don't really like this DB schema. Next time be better - "tags": emoji.tags.split(" ") + [emoji.name[len("marsey"):] if emoji.name.startswith("marsey") else emoji.name] + ([author] if SITE_NAME == 'rDrama' else []), + "tags": emoji.tags.split(" ") + [emoji.name[len("marsey"):] if emoji.name.startswith("marsey") else emoji.name], "count": emoji.count, "class": "Marsey" } for emoji, author in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())] diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 9c06847f3..7dc747db4 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -2,15 +2,28 @@