diff --git a/files/classes/user.py b/files/classes/user.py index 8dadcb768..5e702d067 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -413,14 +413,14 @@ class User(Base): @lazy def banner_url(self): if self.bannerurl: return self.bannerurl - else: return f"https://{site}/assets/images/{site_name}/preview.webp?v=190 + else: return f"https://{site}/assets/images/{site_name}/preview.webp?v=190" @property @lazy def profile_url(self): - if self.agendaposter: return f"https://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=190 + if self.agendaposter: return f"https://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=190" if self.profileurl: return self.profileurl - if "rama" in site: return f"https://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=190 + if "rama" in site: return f"https://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=190" return f"https://{site}/assets/images/default-profile-pic.webp" @property diff --git a/files/routes/static.py b/files/routes/static.py index 959d33435..31bec0dca 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -212,7 +212,7 @@ def log_item(id, v): @app.get("/assets/favicon.ico") def favicon(): - return send_file(f"./assets/images/{site_name}/icon.webp?v=190) + return send_file(f"./assets/images/{site_name}/icon.webp?v=190") @app.get("/api") @auth_desired diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index 92a2f1374..91e58e8b3 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -55,7 +55,7 @@ {% for k, v in badge_types.items() %} - + {{v['name']}} {{v['description']}} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 175f5c12b..2ae52f79c 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - {% endif %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - {% endif %} @@ -90,7 +90,7 @@
- diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index a3b030544..254eefb42 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -1,4 +1,4 @@ - diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index acff85443..55c57813a 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - @@ -93,7 +93,7 @@
- diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html index 1fe3249ee..9d3842512 100644 --- a/files/templates/mobile_navigation_bar.html +++ b/files/templates/mobile_navigation_bar.html @@ -68,7 +68,7 @@ - - {% endif %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} - + @@ -239,7 +239,7 @@ {% block onload %}{% endblock %} - - {% else %} - {% endif %} - + diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html index 72951631c..a6098e9d4 100644 --- a/files/templates/settings_blocks.html +++ b/files/templates/settings_blocks.html @@ -4,7 +4,7 @@ {% block content %} -
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index b651566e6..4f847fa12 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -682,7 +682,7 @@
- {% include "emoji_modal.html" %} {% include "gif_modal.html" %} diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 042a192fa..33a574325 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -4,7 +4,7 @@ {% block content %} -
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 68ab25167..9796254a8 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -4,7 +4,7 @@ - @@ -13,7 +13,7 @@ - @@ -24,13 +24,13 @@ - {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - @@ -140,7 +140,7 @@
-
@@ -148,10 +148,10 @@ - {% if hcaptcha %} - {% endif %} diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 148d8a640..05da6df05 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -5,7 +5,7 @@ - @@ -14,7 +14,7 @@ - @@ -25,13 +25,13 @@ - {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - @@ -83,7 +83,7 @@
- diff --git a/files/templates/submission.html b/files/templates/submission.html index 1d471ab0a..4c160a478 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -87,19 +87,19 @@ } - {% endif %} {% if p.award_count("train") > 1 %} - {% endif %} {% if p.award_count("train") > 2 %} - {% endif %} {% if p.award_count("train") > 3 %} - {% endif %} @@ -320,7 +320,7 @@ {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} {% if p.author.verified %} {% endif %} - {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}} ({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) @@ -371,9 +371,9 @@ {% if p.domain == "twitter.com" %} {{p.embed_url | safe}} {% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %} - {% else %} - {% endif %} {% elif p.domain in ['youtu.be','youtube.com'] and p.embed_url and p.embed_url.startswith(' {% if offset %} - {% endif %} {% elif not p.replies and p.deleted_utc == 0 %} @@ -794,32 +794,32 @@ {% endif %} {% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %} - {% endif %} {% if v %} - {% endif %} {% if not v or v.highlightcomments %} - {% endif %} - {% if not p.comment_count %} {% include "comments.html" %} {% endif %} {% if p.award_count("shit") %} - + + {% endif %} {% if p.award_count("fireflies") %} - + + {% endif %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 7302ac7a8..25fac2ee1 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -9,7 +9,7 @@ {% endif %} {% if not v or v.highlightcomments %} - {% endif %} - \ No newline at end of file + + + \ No newline at end of file diff --git a/files/templates/submit.html b/files/templates/submit.html index 67d7fcecd..b46eac13d 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -3,13 +3,13 @@ - - {% if request.host == 'pcmemes.net' %} {% set cc='Splash Mountain' %} @@ -25,16 +25,16 @@ {% block stylesheets %} {% if v %} - {% endif %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %} - + @@ -175,9 +175,9 @@ {% endblock %} - - + + {% include "emoji_modal.html" %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index bbcb00193..c30123eab 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -97,7 +97,7 @@ - {% if u.customtitle %}

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

{% else %}

 				{% endif %}
 
@@ -105,11 +105,11 @@
 
 				

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

 				{% else %}
 					

 				{% endif %}
@@ -381,11 +381,11 @@
 				
 				

 					{{u.coins}}
-					  
 
 					{% if u.procoins %}
 						{{u.procoins}}
-						  
 					{% endif %}
 
 					{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}   {% endif %}
@@ -725,9 +725,9 @@
 
 	{% if v %}
 		
{% if v.patron or u.patron %}0{% else %}0.03{% endif %}

-		
 		
{{u.username}}

 	{% endif %}
 
-	
 {% endblock %}
\ No newline at end of file