From 399717bd73a4524cf35d00cc19139d4fc06b79ff Mon Sep 17 00:00:00 2001 From: Aevann Date: Tue, 23 Jan 2024 20:26:48 +0200 Subject: [PATCH] do this https://rdrama.net/post/239515/psa-marseymegaphone/5799571#context --- files/assets/js/emoji_modal/emoji_modal.js | 2 +- files/helpers/config/const.py | 3 ++- files/routes/asset_submissions.py | 2 +- files/templates/formatting.html | 10 +++++----- scripts/sync_emojis.sh | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/files/assets/js/emoji_modal/emoji_modal.js b/files/assets/js/emoji_modal/emoji_modal.js index ee2cec757..aa6c9770f 100644 --- a/files/assets/js/emoji_modal/emoji_modal.js +++ b/files/assets/js/emoji_modal/emoji_modal.js @@ -82,7 +82,7 @@ function fetchEmojis() { if (!(emojis instanceof Array )) throw new TypeError("[EMOJI DIALOG] rDrama's server should have sent a JSON-coded Array!"); - let classes = ["Marsey", "Platy", "Wolf", "Donkey Kong", "Tay", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc"] + let classes = ["Marsey", "Tay", "Platy", "Wolf", "Donkey Kong", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc"] const bussyDOM = document.createElement("div"); diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 2f9e0388e..2a1b2e88a 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -999,7 +999,7 @@ GLOBAL2 = environ.get("GLOBAL2", "").strip() STARS = '\n\n★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★\n\n' -EMOJI_KINDS = ("Marsey", "Platy", "Wolf", "Donkey Kong", "Tay", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc") +EMOJI_KINDS = ("Marsey", "Tay", "Platy", "Wolf", "Donkey Kong", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc") t = datetime.datetime.now() @@ -1064,6 +1064,7 @@ CHUD_PHRASES = ( "Israeli lives matter", "Palestinian lives matter", "I love sucking cock", + "this post is on native land` ) HEADERS = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"} diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index c0e1806db..1c7dc9e9c 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -77,7 +77,7 @@ def submit_emoji(v): if kind not in EMOJI_KINDS: abort(400, "Invalid emoji kind!") - if kind in {"Platy", "Wolf", "Tay", "Carp", "Capy"} and not name.startswith(kind.lower()): + if kind in {"Tay", "Platy", "Wolf", "Carp", "Capy"} and not name.startswith(kind.lower()): abort(400, f'The name of this emoji should start with the word "{kind.lower()}"') if kind == "Marsey" and not name.startswith("marsey") and not name.startswith("marcus"): diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 5accd0931..007f0de26 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -344,6 +344,11 @@ :marseyrandom: ??? + + Random Tay Emoji + :tayrandom: + ??? + Random Platy Emoji :platyrandom: @@ -359,11 +364,6 @@ :donkeykongrandom: ??? - - Random Tay Emoji - :tayrandom: - ??? - Random Capy Emoji :capyrandom: diff --git a/scripts/sync_emojis.sh b/scripts/sync_emojis.sh index 8df52f593..96da6d881 100755 --- a/scripts/sync_emojis.sh +++ b/scripts/sync_emojis.sh @@ -23,10 +23,10 @@ fi #clear cache for ppl who have NSFW warnings enabled redis-cli del "${SITE}_flask_cache_emojis_False" redis-cli del "${SITE}_flask_cache_emoji_list_Marsey_False" +redis-cli del "${SITE}_flask_cache_emoji_list_Tay_False" redis-cli del "${SITE}_flask_cache_emoji_list_Platy_False" redis-cli del "${SITE}_flask_cache_emoji_list_Wolf_False" redis-cli del "${SITE}_flask_cache_emoji_list_Donkey Kong_False" -redis-cli del "${SITE}_flask_cache_emoji_list_Tay_False" redis-cli del "${SITE}_flask_cache_emoji_list_Capy_False" redis-cli del "${SITE}_flask_cache_emoji_list_Carp_False" redis-cli del "${SITE}_flask_cache_emoji_list_Marsey Flags_False" @@ -39,10 +39,10 @@ redis-cli del "${SITE}_flask_cache_emoji_list_Misc_False" #clear cache for ppl who have NSFW warnings disabled redis-cli del "${SITE}_flask_cache_emojis_True" redis-cli del "${SITE}_flask_cache_emoji_list_Marsey_True" +redis-cli del "${SITE}_flask_cache_emoji_list_Tay_True" redis-cli del "${SITE}_flask_cache_emoji_list_Platy_True" redis-cli del "${SITE}_flask_cache_emoji_list_Wolf_True" redis-cli del "${SITE}_flask_cache_emoji_list_Donkey Kong_True" -redis-cli del "${SITE}_flask_cache_emoji_list_Tay_True" redis-cli del "${SITE}_flask_cache_emoji_list_Capy_True" redis-cli del "${SITE}_flask_cache_emoji_list_Carp_True" redis-cli del "${SITE}_flask_cache_emoji_list_Marsey Flags_True"