From 4c2cb82f48f0bea57b0fb0f1119e8a9e9258de49 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 10 Jul 2022 22:27:56 +0200 Subject: [PATCH] change deux' assets --- files/classes/sub.py | 2 +- files/classes/submission.py | 4 ++-- files/classes/user.py | 2 +- files/helpers/alerts.py | 2 +- files/templates/authforms.html | 2 +- files/templates/chat.html | 2 +- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/sidebar_Cringetopia.html | 2 +- files/templates/sidebar_PCM.html | 2 +- files/templates/sidebar_WPD.html | 2 +- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/util/assetcache.html | 13 +++++++------ 14 files changed, 21 insertions(+), 20 deletions(-) diff --git a/files/classes/sub.py b/files/classes/sub.py index 5851dfe7c..ecb5f2dd4 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -30,7 +30,7 @@ class Sub(Base): @lazy def sidebar_url(self): if self.sidebarurl: return SITE_FULL + self.sidebarurl - return f'/i/{SITE_NAME}/sidebar.webp?v=2000' + return f'/i/{SITE_NAME}/sidebar.webp?v=3000' @property @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index 59ed0a668..63578f2a5 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -205,13 +205,13 @@ class Submission(Base): @lazy def thumb_url(self): if self.over_18: return f"{SITE_FULL}/assets/images/nsfw.webp?v=1" - elif not self.url: return f"{SITE_FULL}/assets/images/{SITE_NAME}/default_text.webp?v=1" + elif not self.url: return f"{SITE_FULL}/assets/images/{SITE_NAME}/default_text.webp?v=2" elif self.thumburl: if self.thumburl.startswith('/'): return SITE_FULL + self.thumburl return self.thumburl elif self.is_youtube or self.is_video: return f"{SITE_FULL}/assets/images/default_thumb_video.webp?v=1" elif self.is_audio: return f"{SITE_FULL}/assets/images/default_thumb_audio.webp?v=1" - elif self.domain == SITE: return f"{SITE_FULL}/assets/images/{SITE_NAME}/site_preview.webp?v=1" + elif self.domain == SITE: return f"{SITE_FULL}/assets/images/{SITE_NAME}/site_preview.webp?v=3000" else: return f"{SITE_FULL}/assets/images/default_thumb_link.webp?v=1" @property diff --git a/files/classes/user.py b/files/classes/user.py index b392b36ad..87da6935a 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -588,7 +588,7 @@ class User(Base): @lazy def banner_url(self): if self.bannerurl: return self.bannerurl - else: return f"/i/{SITE_NAME}/site_preview.webp?v=2000" + else: return f"/i/{SITE_NAME}/site_preview.webp?v=3000" @property @lazy diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index ce780dcb9..85bacff58 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -137,7 +137,7 @@ if PUSHER_ID != 'blahblahblah': 'title': title, 'body': notifbody, 'deep_link': url, - 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?v=1015', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?v=3000', } }, 'fcm': { diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 74498c72e..2ca312086 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -118,7 +118,7 @@
- cover + cover diff --git a/files/templates/chat.html b/files/templates/chat.html index 459efa804..98805192b 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -195,7 +195,7 @@ - + {% include "emoji_modal.html" %} {% include "expanded_image_modal.html" %} diff --git a/files/templates/login.html b/files/templates/login.html index 662c50145..4c50dc15c 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -110,7 +110,7 @@
- cover + cover diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 7006b91e2..a52c7ac3a 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -96,7 +96,7 @@
- cover + cover diff --git a/files/templates/sidebar_Cringetopia.html b/files/templates/sidebar_Cringetopia.html index 37473d2a4..f603a0ac7 100644 --- a/files/templates/sidebar_Cringetopia.html +++ b/files/templates/sidebar_Cringetopia.html @@ -3,7 +3,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=2000' %} + {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=3000' %} {% endif %} diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html index 53bcdaf23..9908b9dad 100644 --- a/files/templates/sidebar_PCM.html +++ b/files/templates/sidebar_PCM.html @@ -42,7 +42,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=2020' %} + {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=3000' %} {% endif %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 0a1ec62a4..70110f11f 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -3,7 +3,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=2000' %} + {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=3000' %} {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 0758adeb7..0ac594437 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -141,7 +141,7 @@
- cover + cover diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 7a4f41a40..8ca29a2d6 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -85,7 +85,7 @@
- cover + cover diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 1857d2642..0637d5f3c 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -33,12 +33,13 @@ set CACHE_VER = { -%} {%- set CACHE_VER_SITEIMG = { - 'rDrama': 2000, - 'FunOnly': 2000, - 'PCM': 2003, - 'Cringetopia': 2000, - 'WPD': 2000, - 'LGBDropTheT': 2010, + 'rDrama': 3000, + 'FunOnly': 3000, + 'PCM': 3000, + 'Cringetopia': 3000, + 'WPD': 3000, + 'LGBDropTheT': 3000, + 'Deuxrama': 3000, } -%}