From 8db4b363f8cceb800e4bb04e51af531211f2308c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 14 Feb 2022 00:35:55 +0200 Subject: [PATCH] nb --- files/classes/sub.py | 4 +- files/classes/submission.py | 8 +-- files/classes/user.py | 2 +- files/routes/comments.py | 2 +- files/routes/users.py | 4 +- files/templates/authforms.html | 2 +- files/templates/default.html | 68 ++++++++++++------------- files/templates/header.html | 2 +- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 6 +-- files/templates/settings2.html | 8 +-- files/templates/sidebar_2Much4You.html | 2 +- files/templates/sidebar_PCM.html | 2 +- files/templates/sidebar_Ruqqus.html | 2 +- files/templates/sign_up.html | 6 +-- files/templates/sign_up_failed_ref.html | 6 +-- files/templates/submission.html | 8 +-- files/templates/submit.html | 2 +- 19 files changed, 69 insertions(+), 69 deletions(-) diff --git a/files/classes/sub.py b/files/classes/sub.py index 852decaa32..717d3d342f 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -25,10 +25,10 @@ class Sub(Base): @lazy def sidebar_url(self): if self.sidebarurl: return SITE_FULL + self.sidebarurl - return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/sidebar.webp?a=1039' + return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/sidebar.webp?a=1040' @property @lazy def banner_url(self): if self.bannerurl: return SITE_FULL + self.bannerurl - return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/banner.webp?a=1039' \ No newline at end of file + return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/banner.webp?a=1040' \ No newline at end of file diff --git a/files/classes/submission.py b/files/classes/submission.py index 1f4efd4f74..88a372a2f0 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -248,13 +248,13 @@ class Submission(Base): @property @lazy def thumb_url(self): - if self.over_18: return f"{SITE_FULL}/static/assets/images/nsfw.webp" - elif not self.url: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/default_text.webp" + if self.over_18: return f"{SITE_FULL}/static/assets/images/nsfw.webp?a=1" + elif not self.url: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/default_text.webp?a=1" 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}/static/assets/images/default_thumb_yt.webp" - else: return f"{SITE_FULL}/static/assets/images/default_thumb_link.webp" + elif self.is_youtube or self.is_video: return f"{SITE_FULL}/static/assets/images/default_thumb_yt.webp?a=1" + else: return f"{SITE_FULL}/static/assets/images/default_thumb_link.webp?a=1" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 1bb904ed66..146ca42a4a 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -448,7 +448,7 @@ class User(Base): @lazy def banner_url(self): if self.bannerurl: return self.bannerurl - else: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/site_preview.webp?a=1012" + else: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/site_preview.webp?a=1013" @property @lazy diff --git a/files/routes/comments.py b/files/routes/comments.py index 422416866f..d694665a4e 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -584,7 +584,7 @@ def api_comment(v): 'title': f'New reply by @{c.author_name}', 'body': notifbody, 'deep_link': f'{SITE_FULL}/comment/{c.id}?context=8&read=true#context', - 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?a=1010', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?a=1011', } }, 'fcm': { diff --git a/files/routes/users.py b/files/routes/users.py index c70dd246dd..098cc9a1c9 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -501,7 +501,7 @@ def message2(v, username): 'title': f'New message from @{v.username}', 'body': notifbody, 'deep_link': f'{SITE_FULL}/notifications?messages=true', - 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?a=1010', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?a=1011', } }, 'fcm': { @@ -571,7 +571,7 @@ def messagereply(v): 'title': f'New message from @{v.username}', 'body': notifbody, 'deep_link': f'{SITE_FULL}/notifications?messages=true', - 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp"a=1008', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp"a=1010', } }, 'fcm': { diff --git a/files/templates/authforms.html b/files/templates/authforms.html index ef85a775c5..31ef64df2c 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -111,7 +111,7 @@
- cover + cover diff --git a/files/templates/default.html b/files/templates/default.html index bc233c02ca..35a941ada5 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -42,16 +42,16 @@ - + - + {% block title %} {{SITE_NAME}} - + @@ -62,7 +62,7 @@ - + {% endblock %} @@ -71,10 +71,10 @@ - + - - + + @@ -86,127 +86,127 @@ {% block fixedMobileBarJS %} @@ -231,13 +231,13 @@ {% else %} - site banner + site banner {% endif %} {% else %} - + {% endif %} {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index 1f6da113f9..9344df6d5e 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -35,7 +35,7 @@ {% set icon = ('marseyblm','marseykween','marseydynamite','marseyblack','marseymyeisha','marseyetika','marseyobama','marseyblackcop','marseysosa','marseyblackface')|random() %} header icon {% else %} - header icon + header icon {% endif %} {% if SITE_NAME == 'Drama' %} diff --git a/files/templates/login.html b/files/templates/login.html index 05200a43f4..a3af24fa52 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -117,7 +117,7 @@
- cover + cover diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 3371f9a63b..dc99cfc176 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -94,7 +94,7 @@
- cover + cover diff --git a/files/templates/settings.html b/files/templates/settings.html index ed02cefdf3..d4f3da3c39 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -12,13 +12,13 @@ - + {% block pagetitle %}Settings - {{SITE_NAME}}{% endblock %} - + @@ -29,7 +29,7 @@ - + diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 69cd045ef6..aee08d6d73 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -12,13 +12,13 @@ - - + + - + @@ -29,7 +29,7 @@ - + diff --git a/files/templates/sidebar_2Much4You.html b/files/templates/sidebar_2Much4You.html index 430028b661..7e0d837d2f 100644 --- a/files/templates/sidebar_2Much4You.html +++ b/files/templates/sidebar_2Much4You.html @@ -2,7 +2,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set image='/static/assets/images/2Much4You/sidebar.webp?a=1039' %} + {% set image='/static/assets/images/2Much4You/sidebar.webp?a=1040' %} {% endif %} sidebar image diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html index 7edede2150..7e66f75f37 100644 --- a/files/templates/sidebar_PCM.html +++ b/files/templates/sidebar_PCM.html @@ -1,5 +1,5 @@
- + STREAM LIST diff --git a/files/templates/sidebar_Ruqqus.html b/files/templates/sidebar_Ruqqus.html index 5c996a1c11..8e06d9ef86 100644 --- a/files/templates/sidebar_Ruqqus.html +++ b/files/templates/sidebar_Ruqqus.html @@ -2,7 +2,7 @@ {% if sub %} {% set image=sub.sidebar_url %} {% else %} - {% set image='/static/assets/images/Ruqqus/sidebar.webp?a=1039' %} + {% set image='/static/assets/images/Ruqqus/sidebar.webp?a=1040' %} {% endif %} sidebar image diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index f788893b4f..64b567a22e 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -14,7 +14,7 @@ - + @@ -25,7 +25,7 @@ - + {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} @@ -146,7 +146,7 @@
- cover + cover
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 00c15a8db7..1ab5cb3796 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -15,7 +15,7 @@ - + @@ -26,7 +26,7 @@ - + {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} @@ -84,7 +84,7 @@
- cover + cover diff --git a/files/templates/submission.html b/files/templates/submission.html index 381a40d4e6..ee4cefa153 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -282,7 +282,7 @@ - + {% if p.is_video %} {% endif %} @@ -294,7 +294,7 @@ - + {% else %} @@ -307,7 +307,7 @@ {% if p.author %}{% endif %} - + {% if p.url and p.is_video %} {% endif %} @@ -319,7 +319,7 @@ {% if p.author %}{% endif %} - + {% endif %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 61b8b8ef47..e37c8f0ef1 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -10,7 +10,7 @@ - + {% if request.host == 'pcmemes.net' %} {% set cc='Splash Mountain' %}