diff --git a/files/assets/js/emoji_modal/emoji_modal.js b/files/assets/js/emoji_modal/emoji_modal.js index ee2cec7571..aa6c9770fc 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 2f9e0388ed..2a1b2e88af 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 c0e1806dbe..1c7dc9e9c5 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 5accd09310..007f0de266 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -344,6 +344,11 @@