From 0bc42b3307ff45bbad7bb8b6f0daf1c53fa7db8f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 20:35:06 +0200 Subject: [PATCH] df --- files/classes/user.py | 4 ++-- files/templates/authforms.html | 2 +- files/templates/comments.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/formatting.html | 8 ++++---- files/templates/header.html | 2 +- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/marseys.html | 2 +- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submission_listing.html | 4 ++-- files/templates/userpage.html | 4 ++-- 22 files changed, 29 insertions(+), 29 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index e2977dafd..5aec1a24b 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -433,10 +433,10 @@ class User(Base): @property @lazy def profile_url(self): - if self.agendaposter: return f"https://{site}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?a=203" + if self.agendaposter: return f"https://{site}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?a=204" if self.profileurl: return self.profileurl if "rama" in site: return f"https://{site}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?a=202" - return f"https://{site}/static/assets/images/default-profile-pic.webp?a=203" + return f"https://{site}/static/assets/images/default-profile-pic.webp?a=204" @lazy def json_popover(self, v): diff --git a/files/templates/authforms.html b/files/templates/authforms.html index e2632b523..22b85f712 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -111,7 +111,7 @@
- cover + cover diff --git a/files/templates/comments.html b/files/templates/comments.html index 78ff3803f..2e3e98f60 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -216,7 +216,7 @@ {% endif %} @{{c.author.username}}'s profile picture{{c.author.username}} - {% 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 %} {% if c.parent_comment_id and not standalone and level != 1 %}{{c.parent_comment.author.username}}{% endif %} diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html index affade6b4..275a31a80 100644 --- a/files/templates/errors/400.html +++ b/files/templates/errors/400.html @@ -10,7 +10,7 @@
- :#marseybrainlet: + :#marseybrainlet: 

 			
400 Bad Request

 			
That request was bad and you should feel bad.

diff --git a/files/templates/errors/401.html b/files/templates/errors/401.html
index 595d66289..1965d0178 100644
--- a/files/templates/errors/401.html
+++ b/files/templates/errors/401.html
@@ -11,7 +11,7 @@
 	

 	

 
-		:#marseydead:
+		:#marseydead:
 		

 
 			
401 Not Authorized

diff --git a/files/templates/errors/403.html b/files/templates/errors/403.html
index 53f240390..c2e239ce8 100644
--- a/files/templates/errors/403.html
+++ b/files/templates/errors/403.html
@@ -10,7 +10,7 @@
 

 	

 	

-		:#marseytroll:
+		:#marseytroll:
 		

 		
403 Forbidden

 			
YOU AREN'T WELCOME HERE GO AWAY

diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html
index 44941daf9..3a6a221e8 100644
--- a/files/templates/errors/404.html
+++ b/files/templates/errors/404.html
@@ -10,7 +10,7 @@
 

 	

 	

-		:#marseyconfused
+		:#marseyconfused
 		

 		
404 Page Not Found

 			
Someone typed something wrong and it was probably you, please do better.

diff --git a/files/templates/errors/405.html b/files/templates/errors/405.html
index cc4188bb1..0dd47fda1 100644
--- a/files/templates/errors/405.html
+++ b/files/templates/errors/405.html
@@ -10,7 +10,7 @@
 

 	

 	

-		:#marseyretard:
+		:#marseyretard:
 		

 		
405 Method Not Allowed

 			
idk how anyone gets this error but if you see this, remember to follow @carpathianflorist
the original error text here talked about internet gremlins and wtf

diff --git a/files/templates/errors/429.html b/files/templates/errors/429.html
index 464047428..871bddf33 100644
--- a/files/templates/errors/429.html
+++ b/files/templates/errors/429.html
@@ -10,7 +10,7 @@
 

 	

 	

-		:#marseyrentfree:
+		:#marseyrentfree:
 		

 		
429 Too Many Requests

 			
go spam somewhere else nerd

diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index 1dadf2894..b1c65e037 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -10,7 +10,7 @@
 

 	

 		

-			:#marseydead:
+			:#marseydead:
 			

 			
500 Internal Server Error

 			
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 60c9a5551..4a39446f7 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -10,7 +10,7 @@
 

 	

 		

-			:#marseytwerking:
+			:#marseytwerking:
 			
Are you over 18?

 			
This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?

 			

diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html
index 0088eea1e..63e09cbac 100644
--- a/files/templates/errors/patron.html
+++ b/files/templates/errors/patron.html
@@ -10,7 +10,7 @@
 

 	

 	

-			:#marseymerchant:
+			:#marseymerchant:
 			
401 Not Authorized

 			
This page is only available to {% if request.host == "rdrama.net" %}paypigs{% else %}patrons{% endif %}:

 			{{'GUMROAD_LINK' | app_config}}
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 812b269d9..aef214199 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -69,22 +69,22 @@ You can use Markdown formatting:
 		
 			Emojis
 			:marseylove:
-			:marseylove:
+			:marseylove:
 		
 		
 			Mirrored Emojis
 			:!marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Large Emojis
 			:#marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Large Mirroed Emojis
 			:#!marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Poll Options
diff --git a/files/templates/header.html b/files/templates/header.html
index c947525ff..6cd6832ba 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -10,7 +10,7 @@
 				
 					header icon
 					{% if request.host != 'pcmemes.net' %}
-						logo
+						logo
 					{% endif %}
 				
 			

diff --git a/files/templates/log.html b/files/templates/log.html
index 33c4d1b91..a48e858eb 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -56,10 +56,10 @@
 						

 
 							
 							

-								avatarAll
+								avatarAll
 								{% for a in admins %}
 									avatar{{a}}
 								{% endfor %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 37dc3c0b0..dbd01e41c 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 20af269c0..33da34922 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -94,7 +94,7 @@
 
 						

 
-						cover
+						cover
 				

 
 		

diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index 7332d912d..8d4c6afbb 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -19,7 +19,7 @@
 	
 		{{loop.index}}
 		{{k[0]}}
-		:{{k[0]}}:
+		:{{k[0]}}:
 		{{k[2]}}
 		{% if k[1] in ('anton-d','unknown') %}{{k[1]}}{% else %}@{{k[1]}}'s profile picture{{k[1]}}{% endif %}
 	
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 60d4e990c..57d316149 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -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 49af3aacd..61764e37c 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -84,7 +84,7 @@
 
 										

 
-										cover
+										cover
 								

 
 						

diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 7074a5ce8..9a9e1a403 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
@@ -189,7 +189,7 @@
 				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 				{% if p.author.verified %}
 				{% endif %}
-				@{{p.author.profile_url}}'s profile picture{{p.author.username}}{% 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.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% 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/userpage.html b/files/templates/userpage.html
index cc72758f4..f7d61222a 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 %}
 
@@ -368,7 +368,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 %}