From 45c80f01f9566701187fa633afb4365ca50bd4ed Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 17 Jan 2022 17:03:51 +0200 Subject: [PATCH] 1k --- files/classes/badges.py | 2 +- files/classes/user.py | 4 ++-- files/routes/settings.py | 2 +- files/templates/admin/badge_grant.html | 2 +- files/templates/admin/badge_remove.html | 2 +- files/templates/authforms.html | 6 +++--- files/templates/badges.html | 2 +- files/templates/comments.html | 2 +- files/templates/default.html | 4 ++-- 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 | 8 ++++---- files/templates/login.html | 4 ++-- files/templates/login_2fa.html | 4 ++-- files/templates/marseys.html | 2 +- files/templates/patrons.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sidebar_Drama.html | 2 +- files/templates/sign_up.html | 4 ++-- files/templates/sign_up_failed_ref.html | 4 ++-- files/templates/submission.html | 18 +++++++++--------- files/templates/submission_listing.html | 4 ++-- files/templates/submit.html | 4 ++-- files/templates/userpage.html | 4 ++-- 34 files changed, 60 insertions(+), 60 deletions(-) diff --git a/files/classes/badges.py b/files/classes/badges.py index 27937a82b..2ec4d5ee2 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -55,7 +55,7 @@ class Badge(Base): @property @lazy def path(self): - return f"/static/assets/images/badges/{self.name.replace(' ','%20')}.webp?a=4" + return f"/static/assets/images/badges/{self.name.replace(' ','%20')}.webp?a=5" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 57df1c3c1..e2977dafd 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=202" + if self.agendaposter: return f"https://{site}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?a=203" 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=202" + return f"https://{site}/static/assets/images/default-profile-pic.webp?a=203" @lazy def json_popover(self, v): diff --git a/files/routes/settings.py b/files/routes/settings.py index 9591e9070..f2642f5aa 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -473,7 +473,7 @@ def gumroad(v): send_repeatable_notification(v.id, f"You have received {procoins} Marseybux! You can use them to buy awards in the [shop](/shop).") if v.truecoins > 150 and v.patron: v.cluballowed = True - if v.patron > 3 and v.verified == None: v.verified = "Verified" + if v.patron > 1 and v.verified == None: v.verified = "Verified" g.db.add(v) diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index fa280c832..10b4d2f7e 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -60,7 +60,7 @@ - + {{v['name']}} {{v['description']}} diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index 2bf7ad2c1..c225978c3 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -60,7 +60,7 @@ - + {{v['name']}} {{v['description']}} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index a5c27f1b0..e2632b523 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} @@ -111,7 +111,7 @@
- cover + cover diff --git a/files/templates/badges.html b/files/templates/badges.html index 364ad2249..f244aab80 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -21,7 +21,7 @@ {% for k,v in badges.items() %} {{v['name']}} - {{v['name']}} + {{v['name']}} {{v['description']}} {% endfor %} diff --git a/files/templates/comments.html b/files/templates/comments.html index caa188b0e..f488fc9a5 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -217,7 +217,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/default.html b/files/templates/default.html index 9c87f8813..53bbae16f 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html index 59eb6c953..affade6b4 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 59b2136e4..595d66289 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 fddf73509..53f240390 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 f59813e8c..44941daf9 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 3e20bfe69..cc4188bb1 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 868f48c3d..464047428 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 2f65d07cb..1dadf2894 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 8d17a7ccb..60c9a5551 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 293decc79..0088eea1e 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 bcbd97705..812b269d9 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 907fcb796..c947525ff 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 7f840ed4a..33c4d1b91 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

@@ -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 8347ddb64..37dc3c0b0 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
@@ -117,7 +117,7 @@
 
 								

 
-								cover
+								cover
 						

 
 				

diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 489f34afb..20af269c0 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{SITE_NAME}}
 
 		
-		
+		
 
 
 
@@ -94,7 +94,7 @@
 
 						

 
-						cover
+						cover
 				

 
 		

diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index f9868c2d5..7332d912d 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/patrons.html b/files/templates/patrons.html
index be02a7237..e2e36ab0c 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -14,7 +14,7 @@
 		{{loop.index}}
 		@{{u.username}}'s profile picture{{u.username}}
 
-		Patron-{{u.patron}}
+		Patron-{{u.patron}}
 	
 {% endfor %}
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index a8e1ab347..f3cb88500 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -34,7 +34,7 @@
 
 
 	
-	
+	
 	{% if v.agendaposter %}
 		
-		
+		
 	{% else %}
 		
-		
+		
 	{% endif %}
 
 
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html
index 984236bd0..90128ab05 100644
--- a/files/templates/sidebar_Drama.html
+++ b/files/templates/sidebar_Drama.html
@@ -1,6 +1,6 @@
 

 
-    {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=9" %}
+    {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=10" %}
 
     
         
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 5d7aa6108..60d4e990c 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,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 8d0333c84..49af3aacd 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,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 62afd6550..ac2bfec04 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -44,7 +44,7 @@
 	

 		
 			
-				:#marseywholesome:
+				:#marseywholesome:
 			
 		
 	

@@ -53,7 +53,7 @@
 {% if p.award_count("wholesome") > 1 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -61,7 +61,7 @@
 {% if p.award_count("wholesome") > 2 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -69,7 +69,7 @@
 {% if p.award_count("wholesome") > 3 %}
 	
 		
-			:#marseywholesome:
+			:#marseywholesome:
 		
 	
 {% endif %}
@@ -106,25 +106,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 %}
 
@@ -355,7 +355,7 @@
 						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 						{% if p.author.verified %}
 						{% endif %}
-						@{{p.author.username}}'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.username}}'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/submission_listing.html b/files/templates/submission_listing.html
index b92c476c9..d4ab864f3 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/submit.html b/files/templates/submit.html
index ffad4ca8a..edb069aba 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 1011e9234..cc72758f4 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 %}