diff --git a/files/assets/images/emojis/Classic.webp b/files/assets/images/emojis/Classic.webp new file mode 100644 index 0000000000..9f91d2303e Binary files /dev/null and b/files/assets/images/emojis/Classic.webp differ diff --git a/files/assets/images/emojis/Donkey Kong.webp b/files/assets/images/emojis/Donkey Kong.webp new file mode 100644 index 0000000000..5b9d9a3c43 Binary files /dev/null and b/files/assets/images/emojis/Donkey Kong.webp differ diff --git a/files/assets/images/emojis/Marsey Alphabet.webp b/files/assets/images/emojis/Marsey Alphabet.webp new file mode 100644 index 0000000000..aeff6ca020 Binary files /dev/null and b/files/assets/images/emojis/Marsey Alphabet.webp differ diff --git a/files/assets/images/emojis/Marsey Flags.webp b/files/assets/images/emojis/Marsey Flags.webp new file mode 100644 index 0000000000..8771fc874b Binary files /dev/null and b/files/assets/images/emojis/Marsey Flags.webp differ diff --git a/files/assets/images/emojis/Misc.webp b/files/assets/images/emojis/Misc.webp new file mode 100644 index 0000000000..806c7ae6b1 Binary files /dev/null and b/files/assets/images/emojis/Misc.webp differ diff --git a/files/assets/images/emojis/Platy.webp b/files/assets/images/emojis/Platy.webp new file mode 100644 index 0000000000..495ce8fbcc Binary files /dev/null and b/files/assets/images/emojis/Platy.webp differ diff --git a/files/assets/images/emojis/Rage.webp b/files/assets/images/emojis/Rage.webp new file mode 100644 index 0000000000..6fe2810e73 Binary files /dev/null and b/files/assets/images/emojis/Rage.webp differ diff --git a/files/assets/images/emojis/Tay.webp b/files/assets/images/emojis/Tay.webp new file mode 100644 index 0000000000..62dfb2892a Binary files /dev/null and b/files/assets/images/emojis/Tay.webp differ diff --git a/files/assets/images/emojis/Wojak.webp b/files/assets/images/emojis/Wojak.webp new file mode 100644 index 0000000000..46aa90f46a Binary files /dev/null and b/files/assets/images/emojis/Wojak.webp differ diff --git a/files/assets/images/emojis/Wolf.webp b/files/assets/images/emojis/Wolf.webp new file mode 100644 index 0000000000..2360b6d161 Binary files /dev/null and b/files/assets/images/emojis/Wolf.webp differ diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 0ea16e2d0a..4973db11e6 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -187,7 +187,7 @@ def approve_emoji(v, name): cache.delete("emojis") - cache.delete("emoji_list") + cache.delete(f"emoji_list_{emoji.kind}") purge_files_in_cache(f"{SITE_FULL_IMAGES}/e/{emoji.name}/webp") @@ -494,7 +494,7 @@ def update_emoji(v): g.db.add(ma) cache.delete("emojis") - cache.delete("emoji_list") + cache.delete(f"emoji_list_{existing.kind}") return render_template("admin/update_assets.html", v=v, msg=f"'{name}' updated successfully!", name=name, tags=tags, kind=kind, type="Emoji") diff --git a/files/routes/static.py b/files/routes/static.py index e5bb06c863..17079f604c 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -41,24 +41,25 @@ def reddit_post(subreddit, v, path): return redirect(f'https://{reddit}/{post_id}') -@cache.cached(make_cache_key=lambda:"emoji_list") -def get_emoji_list(): +@cache.cached(make_cache_key=lambda kind:f"emoji_list_{kind}") +def get_emoji_list(kind): emojis = [] - for emoji, author in g.db.query(Emoji, User).join(User, Emoji.author_id == User.id).filter(Emoji.submitter_id == None).order_by(Emoji.count.desc()): + for emoji, author in g.db.query(Emoji, User).join(User, Emoji.author_id == User.id).filter(Emoji.submitter_id == None, Emoji.kind == kind).order_by(Emoji.count.desc()): emoji.author = author.username if FEATURES['ASSET_SUBMISSIONS'] else None emojis.append(emoji) return emojis @app.get("/marseys") -def marseys_redirect(): - return redirect("/emojis") - @app.get("/emojis") +def marseys_redirect(): + return redirect("/emojis/Platy") + +@app.get("/emojis/") @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @auth_required -def emoji_list(v): - emojis = get_emoji_list() +def emoji_list(v, kind): + emojis = get_emoji_list(kind) authors = get_accounts_dict([e.author_id for e in emojis], v=v, graceful=True) if FEATURES['ASSET_SUBMISSIONS']: @@ -73,7 +74,7 @@ def emoji_list(v): for emoji in emojis: emoji.user = authors.get(emoji.author_id) - return render_template("emojis.html", v=v, emojis=emojis) + return render_template("emojis.html", v=v, emojis=emojis, kind=kind) diff --git a/files/templates/emojis.html b/files/templates/emojis.html index 1b6f40fcb3..adcd7b2bc1 100644 --- a/files/templates/emojis.html +++ b/files/templates/emojis.html @@ -2,6 +2,19 @@ {% block pagetitle %}Emojis{% endblock %} {% block pagetype %}emojis{% endblock %} {% block content %} +
+
+ +
+ {% for kind in EMOJI_KINDS %} + :{{kind.lower()}}:{{kind}} + {% endfor %} +
+
+
+
diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index bc3fc72661..02d6a1cc5d 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -21,7 +21,7 @@ {% endif %}

- + diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index aa6b62d377..2bf694d06c 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -27,7 +27,7 @@ {% endif %}

- +