From 1576fcd57d87c7b1387aeadbb3d5f46b99e169ae Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 28 Feb 2022 04:06:15 +0200 Subject: [PATCH] farts on u --- files/classes/sub.py | 4 +- files/classes/submission.py | 8 +- files/classes/user.py | 8 +- files/routes/comments.py | 2 +- files/routes/users.py | 2 +- files/templates/admin/badge_grant.html | 2 +- files/templates/admin/badge_remove.html | 2 +- files/templates/admins.html | 2 +- files/templates/authforms.html | 6 +- files/templates/award_modal.html | 2 +- files/templates/badges.html | 2 +- files/templates/ban_modal.html | 2 +- files/templates/changelog.html | 2 +- files/templates/comments.html | 16 ++-- files/templates/default.html | 92 +++++++++++----------- files/templates/delete_post_modal.html | 2 +- files/templates/emoji_modal.html | 2 +- files/templates/errors/400.html | 2 +- files/templates/errors/401.html | 2 +- files/templates/errors/403.html | 2 +- files/templates/errors/404.html | 2 +- files/templates/errors/405.html | 2 +- files/templates/errors/429.html | 2 +- files/templates/errors/500.html | 2 +- files/templates/errors/nsfw.html | 2 +- files/templates/errors/patron.html | 2 +- files/templates/followers.html | 2 +- files/templates/following.html | 2 +- files/templates/formatting.html | 8 +- files/templates/gif_modal.html | 2 +- files/templates/header.html | 16 ++-- files/templates/home.html | 4 +- files/templates/log.html | 10 +-- files/templates/login.html | 8 +- files/templates/login_2fa.html | 4 +- files/templates/marseys.html | 4 +- files/templates/mobile_navigation_bar.html | 2 +- files/templates/patrons.html | 2 +- files/templates/report_post_modal.html | 2 +- files/templates/settings.html | 12 +-- files/templates/settings2.html | 14 ++-- files/templates/settings_blocks.html | 2 +- files/templates/settings_profile.html | 2 +- files/templates/settings_security.html | 2 +- files/templates/sidebar_Drama.html | 2 +- files/templates/sidebar_PCM.html | 2 +- files/templates/sign_up.html | 14 ++-- files/templates/sign_up_failed_ref.html | 10 +-- files/templates/submission.html | 90 ++++++++++----------- files/templates/submission_listing.html | 14 ++-- files/templates/submit.html | 16 ++-- files/templates/userpage.html | 30 +++---- files/templates/userpage_comments.html | 4 +- files/templates/userpage_private.html | 4 +- 54 files changed, 229 insertions(+), 229 deletions(-) diff --git a/files/classes/sub.py b/files/classes/sub.py index 098589359..7e32ab852 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=1041' + return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/sidebar.webp?v=1041' @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=1041' \ No newline at end of file + return f'{SITE_FULL}/static/assets/images/{SITE_NAME}/banner.webp?v=1041' \ No newline at end of file diff --git a/files/classes/submission.py b/files/classes/submission.py index e89dc1f5d..f32957f20 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -251,13 +251,13 @@ class Submission(Base): @property @lazy def thumb_url(self): - 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" + if self.over_18: return f"{SITE_FULL}/static/assets/images/nsfw.webp?v=1" + elif not self.url: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/default_text.webp?v=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?a=1" - else: return f"{SITE_FULL}/static/assets/images/default_thumb_link.webp?a=1" + elif self.is_youtube or self.is_video: return f"{SITE_FULL}/static/assets/images/default_thumb_yt.webp?v=1" + else: return f"{SITE_FULL}/static/assets/images/default_thumb_link.webp?v=1" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index a094f248c..cb5980a05 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -465,17 +465,17 @@ 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=1013" + else: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/site_preview.webp?v=1013" @property @lazy def profile_url(self): - if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?a=1008" + if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?v=1008" if self.profileurl: if self.profileurl.startswith('/'): return SITE_FULL + self.profileurl return self.profileurl - if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/bhm/{random.randint(1, 25)}.webp?a=1008" - return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?a=1008" + if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/bhm/{random.randint(1, 25)}.webp?v=1008" + return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?v=1008" @lazy def json_popover(self, v): diff --git a/files/routes/comments.py b/files/routes/comments.py index 9e9c2edbc..f6fe47488 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -42,7 +42,7 @@ def pusher_thread(interests, c): '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=1011', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?v=1011', } }, 'fcm': { diff --git a/files/routes/users.py b/files/routes/users.py index 7677fe441..e8c46c42a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -26,7 +26,7 @@ def pusher_thread2(interests, notifbody, username): 'title': f'New message from @{username}', 'body': notifbody, 'deep_link': f'{SITE_FULL}/notifications?messages=true', - 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?a=1011', + 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp?v=1011', } }, 'fcm': { diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index 44325fd0a..11c4e6349 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -60,7 +60,7 @@ - + {{badge.name}} {{badge.description}} diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index 77a20c433..395871e69 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -60,7 +60,7 @@ - + {{badge.name}} {{badge.description}} diff --git a/files/templates/admins.html b/files/templates/admins.html index eaad550fc..0764761d4 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -4,7 +4,7 @@ {% block content %} - + 

 
Admins

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index da5fba26f..9280eb380 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
@@ -110,7 +110,7 @@
 
 										

 
-										cover
+										cover
 								
 
 						
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 4bcd61f0a..8f59f0d61 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -1,4 +1,4 @@
-
+