From ce4e42ad45c3d53eb2bd521d2c861f33bacd35fe Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Nov 2021 00:49:48 +0200 Subject: [PATCH] sdfsdf --- files/helpers/const.py | 2 ++ files/routes/comments.py | 10 ++++++++++ files/templates/authforms.html | 2 +- files/templates/comments.html | 2 +- files/templates/default.html | 12 ++++++------ 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 | 4 ++-- files/templates/header.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/patrons.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submission.html | 10 +++++----- files/templates/submission_listing.html | 2 +- files/templates/submit.html | 2 +- files/templates/userpage.html | 14 +++++++------- 27 files changed, 55 insertions(+), 43 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index fc0c2e658..756bd4669 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -8,6 +8,8 @@ SLURS = { "retarded": "r-slurred", "retard": "r-slur", "tard": "r-slur", + "newfag": "newstrag", + "oldfag": "oldstrag", "faggot": "cute twink", "faggot": "cute twink", "fag": "cute twink", diff --git a/files/routes/comments.py b/files/routes/comments.py index fc171b14d..812245bf9 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -878,6 +878,11 @@ def save_comment(cid, v): if not save: new_save=SaveRelationship(user_id=v.id, comment_id=comment.id, type=2) g.db.add(new_save) + + # message = f"@{v.username} has saved your [comment](/comment/{cid})!" + # existing = g.db.query(Comment.id).filter(Comment.author_id == NOTIFICATIONS_ACCOUNT, Comment.body == message).first() + # if not existing: send_notification(comment.author_id, message) + try: g.db.commit() except: g.db.rollback() @@ -895,6 +900,11 @@ def unsave_comment(cid, v): if save: g.db.delete(save) + + # message = f"@{v.username} has unsaved your [comment](/comment/{cid})!" + # existing = g.db.query(Comment.id).filter(Comment.author_id == NOTIFICATIONS_ACCOUNT, Comment.body == message).first() + # if not existing: send_notification(comment.author_id, message) + g.db.commit() return {"message": "Comment unsaved!"} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 5e7ac5810..17b795eaf 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -91,7 +91,7 @@
- + diff --git a/files/templates/comments.html b/files/templates/comments.html index 367106477..b8dedd273 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -303,7 +303,7 @@ {% endif %} {{c.author.username}} - {% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %} + {% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %} {% if c.parent_comment_id and not standalone and level<=7 %}{{ c.parent_comment.author.username }}{% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index ad32cfcac..5ba4aaf91 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -80,9 +80,9 @@ - + - + {% block title %} {{'SITE_NAME' | app_config}} @@ -109,12 +109,12 @@ - - + + - + diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html index aca5efbaa..365184daf 100644 --- a/files/templates/errors/400.html +++ b/files/templates/errors/400.html @@ -10,7 +10,7 @@
- + 

 			
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 7eefda53c..0ba2c09b8 100644
--- a/files/templates/errors/401.html
+++ b/files/templates/errors/401.html
@@ -11,7 +11,7 @@
 	

 	

 
-		
+		
 		

 
 			
401 Not Authorized

diff --git a/files/templates/errors/403.html b/files/templates/errors/403.html
index 5b4eaa77c..b338b48b3 100644
--- a/files/templates/errors/403.html
+++ b/files/templates/errors/403.html
@@ -10,7 +10,7 @@
 

 	

 	

-		
+		
 		

 		
403 Forbidden

 			
YOU AREN'T WELCOME HERE GO AWAY

diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html
index d217c1d06..c408ec6b6 100644
--- a/files/templates/errors/404.html
+++ b/files/templates/errors/404.html
@@ -10,7 +10,7 @@
 

 	

 	

-		
+		
 		

 		
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 a33f403a2..b240e49b0 100644
--- a/files/templates/errors/405.html
+++ b/files/templates/errors/405.html
@@ -10,7 +10,7 @@
 

 	

 	

-		
+		
 		

 		
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 c45283b9e..29357cb16 100644
--- a/files/templates/errors/429.html
+++ b/files/templates/errors/429.html
@@ -10,7 +10,7 @@
 

 	

 	

-		
+		
 		

 		
429 Too Many Requests

 			
go spam somewhere else nerd

diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index 486a7e061..b31eea6e6 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -10,7 +10,7 @@
 

 	

 		

-			
+			
 			

 			
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 0e34702b1..25371ead2 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -10,7 +10,7 @@
 

 	

 		

-			
+			
 			
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 fa0f52175..ae08e4dde 100644
--- a/files/templates/errors/patron.html
+++ b/files/templates/errors/patron.html
@@ -10,7 +10,7 @@
 

 	

 	

-			
+			
 			
401 Not Authorized

 			
This page is only available to {% if "rama" in request.host %}paypigs{% else %}patrons{% endif %}:

 			{{'GUMROAD_LINK' | app_config}}
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 0ac5efb23..4b91b74f5 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -56,12 +56,12 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting.
 		
 			Emojis
 			:marseylove:
-			:marseylove:
+			:marseylove:
 		
 		
 			Mirrored Emojis
 			:!marseylove:
-			:!marseylove:
+			:!marseylove:
 		
 		
 			Poll Options
diff --git a/files/templates/header.html b/files/templates/header.html
index 7f97b6103..222e6a68a 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -21,10 +21,10 @@
 		

 			

 				
-					
+					
 					{% if "gigachadlife" in request.host %}
 						GigaChadLife
-					{% elif "shithole" not in request.host %}
+					{% elif "shithole" not in request.host and 'pcm' not in request.host %}
 						
 					{% endif %}
 				
diff --git a/files/templates/login.html b/files/templates/login.html
index 3c027a6c1..f08340a4f 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -107,7 +107,7 @@
 
 								

 
-								
+								
 						

 
 				

diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index aa5b2ef45..0ed76dd61 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -92,7 +92,7 @@
 
 						

 
-						
+						
 				

 
 		

diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index 24228acbd..9c0017049 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -15,7 +15,7 @@
 		{{loop.index}}
 		{{row['username']}}
 
-		
+		
 
 		
 			{% for (a,count) in row['awards'].values() %}
diff --git a/files/templates/settings.html b/files/templates/settings.html
index c8699dc04..4d4a8dbc1 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -32,7 +32,7 @@
 	
 	
 
-	
+	
 
 	{% block pagetitle %}Settings - {{'SITE_NAME' | app_config}}{% endblock %}
 		
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 3b8b69a7e..28714fef2 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -11,8 +11,8 @@
 	
 	
 	
-	
-	
+	
+	
 
 	
 	
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 3e8288b49..023d41c6b 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -154,7 +154,7 @@
 
 								

 
-								
+								
 						

 
 				

diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index cd96d67c0..dc1038999 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -83,7 +83,7 @@
 
 										

 
-										
+										
 								

 
 						

diff --git a/files/templates/submission.html b/files/templates/submission.html
index cc8c8ba50..b4c4da9ee 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 %}
 
 
@@ -446,7 +446,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 %}{% endif %}{{p.author.customtitle | safe}}{% endif %}
+						{{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 %})
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index df03887e7..b0ab04b12 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -216,7 +216,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 %}{% endif %}{{p.author.customtitle | safe}}{% endif %}
+				{{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 %})
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 5e3ad3156..89ee8e62a 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -10,7 +10,7 @@
 		
 		
 		
-		
+		
 
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index fe73c0d96..97a333212 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -5,7 +5,7 @@
 
 {% block title %}
 
-{% if u and u.profilecss %}
+{% if u and u.profilecss and not (v and v.admin_level) %}
 	
 {% endif %}
 
@@ -155,7 +155,7 @@
 					
 
 				

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

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

 				{% else %}

 				{% endif %}
 
@@ -163,11 +163,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 %}
@@ -436,7 +436,7 @@
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you
 				{% endif %}
-				{% if u.customtitle %}
{% if u.quadrant %}{% endif %}{{u.customtitle | safe}}

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

 				{% else %}
 					

 				{% endif %}
@@ -445,11 +445,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 %}