From 1dded411693c99a1e6256fb73d02fbc7a8c7f15a Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 27 Oct 2023 15:01:50 +0300 Subject: [PATCH] fix emoji caching --- files/assets/js/emoji_modal/emoji_modal.js | 4 ++-- files/assets/js/emoji_modal/search_dictionary.js | 4 ++-- files/routes/jinja2.py | 2 +- files/routes/static.py | 4 ++-- files/templates/modals/emoji.html | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/files/assets/js/emoji_modal/emoji_modal.js b/files/assets/js/emoji_modal/emoji_modal.js index ce31f5ad3..cb965a23d 100644 --- a/files/assets/js/emoji_modal/emoji_modal.js +++ b/files/assets/js/emoji_modal/emoji_modal.js @@ -73,8 +73,8 @@ let emojiSearcher = { // get public emojis list function fetchEmojis() { const headers = new Headers({xhr: "xhr"}) - const emoji_num = document.getElementById('emoji_num').value - return fetch(`/emojis.csv?x=${emoji_num}`, { + const emoji_params = document.getElementById('emoji_params').value + return fetch(`/emojis.csv${emoji_params}`, { headers, }) .then(res => res.json()) diff --git a/files/assets/js/emoji_modal/search_dictionary.js b/files/assets/js/emoji_modal/search_dictionary.js index 6f9895ae3..8f44f46ec 100644 --- a/files/assets/js/emoji_modal/search_dictionary.js +++ b/files/assets/js/emoji_modal/search_dictionary.js @@ -60,8 +60,8 @@ const emojisSearchDictionary = { function makeEmojisSearchDictionary() { // get public emojis list const headers = new Headers({xhr: "xhr"}) - const emoji_num = document.getElementById('emoji_num').value - return fetch(`/emojis.csv?x=${emoji_num}`, { + const emoji_params = document.getElementById('emoji_params').value + return fetch(`/emojis.csv${emoji_params}`, { headers, }) .then(res => res.json()) diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 5e85c09cf..3ec10ae64 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -151,5 +151,5 @@ def inject_constants(): "CHUD_PHRASES":CHUD_PHRASES, "hasattr":hasattr, "calc_users":calc_users, "HOLE_INACTIVITY_DELETION":HOLE_INACTIVITY_DELETION, "LIGHT_THEMES":LIGHT_THEMES, "OVER_18_EMOJIS":OVER_18_EMOJIS, "MAX_IMAGE_AUDIO_SIZE_MB":MAX_IMAGE_AUDIO_SIZE_MB, "MAX_IMAGE_AUDIO_SIZE_MB_PATRON":MAX_IMAGE_AUDIO_SIZE_MB_PATRON, "MAX_VIDEO_SIZE_MB":MAX_VIDEO_SIZE_MB, "MAX_VIDEO_SIZE_MB_PATRON":MAX_VIDEO_SIZE_MB_PATRON, - "CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, "get_running_orgy":get_running_orgy, "TRUESCORE_MINIMUM":TRUESCORE_MINIMUM, "bar_position":bar_position, "datetime":datetime, "CSS_LENGTH_LIMIT":CSS_LENGTH_LIMIT, "emoji_num":cache.get("emojis_num") or 0, + "CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, "get_running_orgy":get_running_orgy, "TRUESCORE_MINIMUM":TRUESCORE_MINIMUM, "bar_position":bar_position, "datetime":datetime, "CSS_LENGTH_LIMIT":CSS_LENGTH_LIMIT, "cache":cache, } diff --git a/files/routes/static.py b/files/routes/static.py index 43b446fb0..5d34a4bb6 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -119,8 +119,8 @@ def get_emojis(nsfw): @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @auth_required def emojis(v): - return get_emojis(g.show_nsfw) - + show_nsfw = request.values.get('show_nsfw') == 'True' + return get_emojis(show_nsfw) @app.get('/sidebar') diff --git a/files/templates/modals/emoji.html b/files/templates/modals/emoji.html index ae1dd7037..78fe931af 100644 --- a/files/templates/modals/emoji.html +++ b/files/templates/modals/emoji.html @@ -70,7 +70,8 @@ - +{% set emoji_num = cache.get("emojis_num") or 0 %} +