From 823a86b03ebdde4337abe8b9627d5492b8b455f9 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 24 Jan 2022 18:44:54 +0200 Subject: [PATCH] cvcv --- files/classes/badges.py | 2 +- files/classes/user.py | 8 +-- files/templates/admin/badge_grant.html | 2 +- files/templates/admin/badge_remove.html | 2 +- files/templates/authforms.html | 2 +- files/templates/badges.html | 2 +- files/templates/comments.html | 2 +- files/templates/default.html | 70 ++++++++++++------------- 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/formatting.html | 8 +-- files/templates/header.html | 8 +-- files/templates/log.html | 4 +- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/patrons.html | 2 +- files/templates/settings.html | 6 +-- files/templates/settings2.html | 8 +-- files/templates/sidebar_PCM.html | 2 +- files/templates/sign_up.html | 6 +-- files/templates/sign_up_failed_ref.html | 6 +-- files/templates/submission.html | 26 ++++----- files/templates/submission_listing.html | 4 +- files/templates/submit.html | 2 +- files/templates/userpage.html | 12 ++--- 32 files changed, 103 insertions(+), 103 deletions(-) diff --git a/files/classes/badges.py b/files/classes/badges.py index 7c6e2ccb1..4405e88bc 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -61,7 +61,7 @@ class Badge(Base): @property @lazy def path(self): - return f"/static/assets/images/badges/{self.badge_id}.webp?a=6" + return f"/static/assets/images/badges/{self.badge_id}.webp?a=1008" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 9c146076d..521dcd0f5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -426,15 +426,15 @@ 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=1" + else: return f"{SITE_FULL}/static/assets/images/{SITE_NAME}/site_preview.webp?a=1008" @property @lazy def profile_url(self): - if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?a=204" + if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?a=1008" if self.profileurl: return self.profileurl - if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=202" - return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?a=204" + if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=1008" + return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?a=1008" @lazy def json_popover(self, v): diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index bd55e4c11..ea422d2b8 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 1d1ed73e8..dbb986e04 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/authforms.html b/files/templates/authforms.html index 0d8dad128..8b786e2fe 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -111,7 +111,7 @@
- cover + cover diff --git a/files/templates/badges.html b/files/templates/badges.html index 9aaedcaba..643c3d6b5 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -21,7 +21,7 @@ {% for badge in badges %} {{badge.name}} - {{badge.name}} + {{badge.name}} {{badge.description}} {% endfor %} diff --git a/files/templates/comments.html b/files/templates/comments.html index 6025d66ce..e6bba4c3e 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -217,7 +217,7 @@ 👻 {% else %} @{{c.author_name}}'s profile picture{{c.author_name}} - {% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %} + {% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %} {% endif %} {% if c.parent_comment_id and not standalone and level != 1 %}{{c.parent_comment.author_name}}{% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 0f2c7e5ac..81dcc6b3e 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -12,7 +12,7 @@ {% if v.agendaposter %}
- :#marseywholesome: + :#marseywholesome:
{% endif %} @@ -71,7 +71,7 @@ }
- :#marseywholesome: + :#marseywholesome:
{% endif %} @@ -83,7 +83,7 @@ }
- :#marseywholesome: + :#marseywholesome:
{% endif %} @@ -95,7 +95,7 @@ }
- :#marseywholesome: + :#marseywholesome:
{% endif %} {% else %} @@ -122,7 +122,7 @@
- :#marseywholesome: + :#marseywholesome:
@@ -131,7 +131,7 @@ {% if p.award_count("wholesome") > 1 %} - :#marseywholesome: + :#marseywholesome: {% endif %} @@ -139,7 +139,7 @@ {% if p.award_count("wholesome") > 2 %} - :#marseywholesome: + :#marseywholesome: {% endif %} @@ -147,7 +147,7 @@ {% if p.award_count("wholesome") > 3 %} - :#marseywholesome: + :#marseywholesome: {% endif %} @@ -185,25 +185,25 @@ - :#marseytrain: + :#marseytrain: {% endif %} {% if p.award_count("train") > 1 %} - :#marseytrain: + :#marseytrain: {% endif %} {% if p.award_count("train") > 2 %} - :#marseytrain: + :#marseytrain: {% endif %} {% if p.award_count("train") > 3 %} - :#marseytrain: + :#marseytrain: {% endif %} @@ -440,7 +440,7 @@ {% else %} {% if p.author.verified %} {% endif %} - @{{p.author_name}}'s profile picture{{p.author_name}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %} + @{{p.author_name}}'s profile picture{{p.author_name}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %} {% endif %}  {{p.age_string}} ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 53b96c143..869946dc5 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -133,7 +133,7 @@
{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} - post thumnail + post thumnail {% elif not p.url %} post thumnail @@ -192,7 +192,7 @@ {% else %} {% if p.author.verified %} {% endif %} - @{{p.author.profile_url}}'s profile picture{{p.author_name}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %} + @{{p.author.profile_url}}'s profile picture{{p.author_name}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %} {% endif %}  {{p.age_string}}   diff --git a/files/templates/submit.html b/files/templates/submit.html index c27ad78dc..1c3b7914b 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -10,7 +10,7 @@ - + {% if request.host == 'pcmemes.net' %} {% set cc='Splash Mountain' %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 0859152a9..16cec67c5 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -95,7 +95,7 @@
- {% if u.customtitle %}

{% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

+ {% if u.customtitle %}

{% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

{% else %}

 				{% endif %}
 
@@ -103,10 +103,10 @@
 
 				

 					{{u.coins}}
-					coins  
+					coins  
 
 					{{u.procoins}}
-					marseybux  
+					marseybux  
 
 					{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}  
 
@@ -366,7 +366,7 @@
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you
 				{% endif %}
-				{% if u.customtitle %}
{% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

+				{% if u.customtitle %}
{% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

 				{% else %}
 					

 				{% endif %}
@@ -375,10 +375,10 @@
 				
 				

 					{{u.coins}}
-					coins  
+					coins  
 
 					{{u.procoins}}
-					marseybux  
+					marseybux  
 
 					{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}