From 1c8f30ec1ee7cec52e646f451a496559da3fe08c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 3 Jan 2022 12:32:31 +0200 Subject: [PATCH] fds --- files/routes/admin.py | 39 ++++++++++++++--- files/routes/awards.py | 32 +++++++------- files/routes/login.py | 4 -- files/routes/settings.py | 4 -- files/routes/static.py | 7 ++-- files/templates/admin/alt_votes.html | 2 +- files/templates/admin/banned_domains.html | 2 +- files/templates/admin/content_stats.html | 2 +- files/templates/{ => admin}/shadowbanned.html | 10 +++-- files/templates/admins.html | 14 ++++--- files/templates/agendaposters.html | 4 +- files/templates/authforms.html | 4 +- files/templates/badges.html | 2 +- files/templates/banned.html | 6 +-- files/templates/blocks.html | 6 +-- files/templates/default.html | 4 +- files/templates/emoji_modal.html | 2 +- files/templates/followers.html | 4 +- files/templates/following.html | 4 +- files/templates/formatting.html | 8 ++-- files/templates/grassed.html | 4 +- files/templates/header.html | 2 +- files/templates/leaderboard.html | 42 +++++++++---------- files/templates/log.html | 4 +- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/patrons.html | 4 +- files/templates/rentoids.html | 4 +- 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/submit.html | 4 +- files/templates/thiefs.html | 12 +++--- files/templates/userpage.html | 4 +- files/templates/userpage_blocked.html | 2 +- files/templates/userpage_blocking.html | 2 +- files/templates/viewers.html | 4 +- files/templates/voters.html | 4 +- files/templates/votes.html | 8 ++-- 40 files changed, 149 insertions(+), 125 deletions(-) rename files/templates/{ => admin}/shadowbanned.html (69%) diff --git a/files/routes/admin.py b/files/routes/admin.py index b053a1bbe..c8ceb54f7 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -27,6 +27,33 @@ if SITE_NAME == 'PCM': cc = "splash mountain" else: cc = "country club" month = datetime.now().strftime('%B') +@app.post("/@/make_admin") +@limiter.limit("1/second") +@admin_level_required(3) +@validate_formkey +def make_admin(v, username): + if request.host == 'rdrama.net': abort(403) + user = get_user(username) + if not user: abort(404) + user.admin_level = 2 + g.db.add(user) + g.db.commit() + return {"message": "User has been made admin!"} + + +@app.post("/@/remove_admin") +@limiter.limit("1/second") +@admin_level_required(3) +@validate_formkey +def remove_admin(v, username): + if request.host == 'rdrama.net': abort(403) + user = get_user(username) + if not user: abort(404) + user.admin_level = 0 + g.db.add(user) + g.db.commit() + return {"message": "Admin removed!"} + @app.get("/admin/grassed") @admin_level_required(2) @@ -258,12 +285,11 @@ def shadowbanned(v): users = [x for x in g.db.query(User).filter(User.shadowbanned != None).all()] if not v or v.oldsite: template = '' else: template = 'CHRISTMAS/' - return render_template(f"{template}shadowbanned.html", v=v, users=users) + return render_template(f"{template}admin/shadowbanned.html", v=v, users=users) -@app.get("/admin/agendaposters") -@auth_required +@app.get("/agendaposters") +@auth_desired def agendaposters(v): - if not (v and v.admin_level > 1): abort(404) users = [x for x in g.db.query(User).filter_by(agendaposter = True).all()] if not v or v.oldsite: template = '' else: template = 'CHRISTMAS/' @@ -404,8 +430,9 @@ def badge_grant_post(v): g.db.add(new_badge) - text = f"@{v.username} has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}" - send_notification(user.id, text) + if v.id != user.id: + text = f"@{v.username} has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}" + send_notification(user.id, text) g.db.commit() return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES, msg="Badge granted!") diff --git a/files/routes/awards.py b/files/routes/awards.py index e3b011c50..6f6c17d97 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -213,12 +213,11 @@ def award_post(pid, v): post_award.submission_id = post.id g.db.add(post_award) - msg = f"@{v.username} has given your [post]({post.permalink}) the {AWARDS[kind]['title']} Award!" - - note = request.values.get("note", "").strip() - if note: msg += f"\n\n> {note}" - - send_repeatable_notification(post.author.id, msg) + if v.id != post.author.id: + msg = f"@{v.username} has given your [post]({post.permalink}) the {AWARDS[kind]['title']} Award!" + note = request.values.get("note", "").strip() + if note: msg += f"\n\n> {note}" + send_repeatable_notification(post.author.id, msg) author = post.author if kind == "ban": @@ -379,12 +378,12 @@ def award_comment(cid, v): comment_award.comment_id = c.id g.db.add(comment_award) - msg = f"@{v.username} has given your [comment]({c.permalink}) the {AWARDS[kind]['title']} Award!" + if v.id != c.author.id: + msg = f"@{v.username} has given your [comment]({c.permalink}) the {AWARDS[kind]['title']} Award!" + note = request.values.get("note", "").strip() + if note: msg += f"\n\n> {note}" + send_repeatable_notification(c.author.id, msg) - note = request.values.get("note", "").strip() - if note: msg += f"\n\n> {note}" - - send_repeatable_notification(c.author.id, msg) author = c.author if kind == "ban": @@ -554,12 +553,11 @@ def admin_userawards_post(v): g.db.add(award) - text = "You were given the following awards:\n\n" - - for key, value in notify_awards.items(): - text += f" - **{value}** {AWARDS[key]['title']} {'Awards' if value != 1 else 'Award'}\n" - - send_repeatable_notification(u.id, text) + if v.id != u.id: + text = "You were given the following awards:\n\n" + for key, value in notify_awards.items(): + text += f" - **{value}** {AWARDS[key]['title']} {'Awards' if value != 1 else 'Award'}\n" + send_repeatable_notification(u.id, text) note = "" diff --git a/files/routes/login.py b/files/routes/login.py index fd48dca31..723adab04 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -389,8 +389,6 @@ def get_reset(): user_id = request.values.get("id") - if user_id == PW_ID: abort(403) - timestamp = int(request.values.get("time",0)) token = request.values.get("token") @@ -426,8 +424,6 @@ def post_reset(v): user_id = request.values.get("user_id") - if user_id == PW_ID: abort(403) - timestamp = int(request.values.get("time")) token = request.values.get("token") diff --git a/files/routes/settings.py b/files/routes/settings.py index 88e95b197..44e9d45fd 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -580,8 +580,6 @@ def verifiedcolor(v): @validate_formkey def settings_security_post(v): if request.values.get("new_password"): - if v.id == PW_ID: abort(403) - if request.values.get("new_password") != request.values.get("cnf_password"): return render_template("settings_security.html", v=v, error="Passwords do not match.") @@ -633,8 +631,6 @@ def settings_security_post(v): return render_template("settings_security.html", v=v, error="Check your email and click the verification link to complete the email change.") if request.values.get("2fa_token"): - if v.id == PW_ID: abort(403) - if not v.verifyPass(request.values.get('password')): return render_template("settings_security.html", v=v, error="Invalid password or token.") diff --git a/files/routes/static.py b/files/routes/static.py index af2c058c1..1cb6a7870 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -41,7 +41,8 @@ def participation_stats(v): day = now - 86400 - data = {"valid_users": g.db.query(User.id).count(), + data = {"marseys": len(marseys), + "valid_users": g.db.query(User.id).count(), "private_users": g.db.query(User.id).filter_by(is_private=True).count(), "banned_users": g.db.query(User.id).filter(User.is_banned > 0).count(), "verified_email_users": g.db.query(User.id).filter_by(is_activated=True).count(), @@ -102,10 +103,10 @@ def cached_chart(days): if days > 31: file = "/weekly_chart.png" - day_cutoffs = [today_cutoff - 86400 * 7 * i for i in range(31)][1:] + day_cutoffs = [today_cutoff - 86400 * 7 * i for i in range(35)][1:] else: file = "/daily_chart.png" - day_cutoffs = [today_cutoff - 86400 * i for i in range(31)][1:] + day_cutoffs = [today_cutoff - 86400 * i for i in range(35)][1:] day_cutoffs.insert(0, calendar.timegm(now)) diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index 0c6cbc472..79a1ed723 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -27,7 +27,7 @@ -
+
diff --git a/files/templates/admin/banned_domains.html b/files/templates/admin/banned_domains.html index bac049522..ce584bf51 100644 --- a/files/templates/admin/banned_domains.html +++ b/files/templates/admin/banned_domains.html @@ -10,7 +10,7 @@ -
+
diff --git a/files/templates/admin/content_stats.html b/files/templates/admin/content_stats.html index 2299101a3..9e964fe4b 100644 --- a/files/templates/admin/content_stats.html +++ b/files/templates/admin/content_stats.html @@ -7,7 +7,7 @@ {% block content %} 

-

 	
 		

 			Domain

+

diff --git a/files/templates/shadowbanned.html b/files/templates/admin/shadowbanned.html
similarity index 69%
rename from files/templates/shadowbanned.html
rename to files/templates/admin/shadowbanned.html
index 005f57722..5e5787cde 100644
--- a/files/templates/shadowbanned.html
+++ b/files/templates/admin/shadowbanned.html
@@ -1,18 +1,20 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-

 
 	

 		Statistic

+
+
+

-		
-		
+		
+		
 {% for user in users %}
 	
-		
+		
 {% endfor %}
diff --git a/files/templates/admins.html b/files/templates/admins.html
index 3b1d6ef01..92d577f23 100644
--- a/files/templates/admins.html
+++ b/files/templates/admins.html
@@ -3,22 +3,26 @@
 {% block pagetitle %}Admins{% endblock %}
 
 {% block content %}
+
+
+
 
Admins

-

 
 	

 		#NameShadowbanned byNameShadowbanned by
 	

 

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 		{{user.shadowbanned}}
 	

 
 

+

+

-		
-		
-		
+		
+		
+		
 {% for user in admins %}
 	
-		
+		
diff --git a/files/templates/agendaposters.html b/files/templates/agendaposters.html
index 72dfd41a0..aeea1e379 100644
--- a/files/templates/agendaposters.html
+++ b/files/templates/agendaposters.html
@@ -1,7 +1,7 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-

 
 	

 		#NameTruescoreMod actionsNameTruescoreMod actions
 	

 

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}{% if user.admin_level == 1 and v and v.admin_level > 1 %}{% endif %}@{{user.username}}'s profile picture{{user.username}}{% if user.admin_level == 1 and v and v.admin_level > 1 %}{% endif %}
 		{{user.truecoins}}
 		{{user.modaction_num}}
 	

+

@@ -11,7 +11,7 @@
 {% for user in users %}
 	
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 	

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index a85aa3e35..13ee53cba 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/badges.html b/files/templates/badges.html
index 2ef67c8b9..2a13b1147 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -10,7 +10,7 @@
 
 
 
-

+

diff --git a/files/templates/banned.html b/files/templates/banned.html
index 4a5f32a34..a54b02087 100644
--- a/files/templates/banned.html
+++ b/files/templates/banned.html
@@ -1,7 +1,7 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-

 
 	

 		Name

+

@@ -13,9 +13,9 @@
 {% for user in users %}
 	
-		
+		
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 		{% if user.ban_reason %}{{user.ban_reason}}{% endif %}@{{user.banned_by.username}}'s profile picture{{user.banned_by.username}}@{{user.banned_by.username}}'s profile picture{{user.banned_by.username}}
 	

diff --git a/files/templates/blocks.html b/files/templates/blocks.html
index 236a1ec3e..9e19c2633 100644
--- a/files/templates/blocks.html
+++ b/files/templates/blocks.html
@@ -5,7 +5,7 @@
 {% block content %}
 
 Blocks

 

-

+

@@ -14,8 +14,8 @@
 
 {% for user in users %}
 	
-		
-		
+		
+		
 {% endfor %}
 

 
 	

 		User
{{user.username}}{{targets[loop.index-1].username}}{{user.username}}{{targets[loop.index-1].username}}
 	

diff --git a/files/templates/default.html b/files/templates/default.html
index 50f166d71..1c09e3476 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/emoji_modal.html b/files/templates/emoji_modal.html
index 7b3e5642b..eb076e80e 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -80,7 +80,7 @@
 	

 

 
-
+
 
 
-	
+	
 	{% if v.agendaposter %}
 		
-	
+	
 {% endif %}
 
 

diff --git a/files/templates/login.html b/files/templates/login.html
index a3c594501..fc8d4b1d0 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	
-	
+	
 	
 
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 151009799..37aa5caa0 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
 		2-Step Login - {{'SITE_NAME' | app_config}}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index 60663ca2c..719bf6d00 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -1,7 +1,7 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-

+

@@ -12,7 +12,7 @@
 {% for u in users %}
 	
-		
+		
diff --git a/files/templates/rentoids.html b/files/templates/rentoids.html
index e7d5ba12d..acc075cd5 100644
--- a/files/templates/rentoids.html
+++ b/files/templates/rentoids.html
@@ -3,7 +3,7 @@
 
Rentoids

-

 
 	

 		#

 		{{loop.index}}@{{u.username}}'s profile picture{{u.username}}@{{u.username}}'s profile picture{{u.username}}
 
 		Patron-{{u.patron}}
 	

 
 

+

@@ -13,7 +13,7 @@
 {% for user in users %}
 	
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 	

diff --git a/files/templates/settings.html b/files/templates/settings.html
index 38cd1a8a5..722a1cc10 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/sign_up.html b/files/templates/sign_up.html
index c5ab9b3fc..3f6613cf9 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' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 53f5a8d56..5dbe6ed50 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' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 60c6343ce..8ae479880 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/thiefs.html b/files/templates/thiefs.html
index 18be36ba2..768ff99d4 100644
--- a/files/templates/thiefs.html
+++ b/files/templates/thiefs.html
@@ -3,7 +3,7 @@
 

 
Successful thiefs

 

-

+

@@ -13,7 +13,7 @@
 {% for user in successful %}
 	
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 	

@@ -21,7 +21,7 @@
 

 
Evicted thiefs

 

-

+

@@ -31,7 +31,7 @@
 {% for user in failed2 %}
 	
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 	

@@ -39,7 +39,7 @@
 

 
Jailed thiefs

 

-

+

@@ -49,7 +49,7 @@
 {% for user in failed %}
 	
-		
+		
 {% endfor %}
 

 
 	

 		#

 		{{loop.index}}@{{user.username}}'s profile picture{{user.username}}@{{user.username}}'s profile picture{{user.username}}
 	

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 35b0170c7..67be90191 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -53,7 +53,7 @@
 								{% if u.unban_utc %}
{{u.unban_string}}
{% endif %}
 							{% endif %}
 							

-								
{{u.username}}

+								
{{u.username}}

 								{% if u.username != u.original_username %}
 								
 									
@@ -352,7 +352,7 @@
 					{% if u.unban_utc %}
{{u.unban_string}}
{% endif %}
 				{% endif %}
 				{% if u.verified %} {% endif %}
-				
{{u.username}}

+				
{{u.username}}

 				{% if u.username != u.original_username %}
 					
 						
diff --git a/files/templates/userpage_blocked.html b/files/templates/userpage_blocked.html
index 7ef98a17a..cdd9ea337 100644
--- a/files/templates/userpage_blocked.html
+++ b/files/templates/userpage_blocked.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-<span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span>
+<span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span>
 
 {% endblock %}
 
diff --git a/files/templates/userpage_blocking.html b/files/templates/userpage_blocking.html
index 0d6d9f5ba..9c2c3dc3a 100644
--- a/files/templates/userpage_blocking.html
+++ b/files/templates/userpage_blocking.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block title %}
-<span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}};"{% endif %}>{{u.username}}</span>
+<span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span>
 
 {% endblock %}
 
diff --git a/files/templates/viewers.html b/files/templates/viewers.html
index 40a810bfa..5fb11ff2b 100644
--- a/files/templates/viewers.html
+++ b/files/templates/viewers.html
@@ -3,7 +3,7 @@
 

 
Users who viewed your profile

 

-

+

@@ -12,7 +12,7 @@
 
 {% for view in viewers %}
 	
-		
+		
 {% endfor %}
diff --git a/files/templates/voters.html b/files/templates/voters.html
index 8db287868..4ae5e9c49 100644
--- a/files/templates/voters.html
+++ b/files/templates/voters.html
@@ -6,7 +6,7 @@
 
{{name2}}

-

 
 	

 		Name
@{{view.viewer.username}}'s profile picture{{view.viewer.username}}@{{view.viewer.username}}'s profile picture{{view.viewer.username}}
 		{{view.last_view_string}}
 	

 
 

+

@@ -18,7 +18,7 @@
 {% for user in users %}
 	
-		
+		
 {% endfor %}
diff --git a/files/templates/votes.html b/files/templates/votes.html
index 99ea86fba..d8c0988cc 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -19,20 +19,20 @@
 
Downvotes: {{downs | length}}
Upvotes

-

 
 	

 		#

 		{{loop.index}}@{{user[0].username}}'s profile picture{{user[0].username}}@{{user[0].username}}'s profile picture{{user[0].username}}
 		{{user[1]}}
 	

 
 

+

 
 	{% for vote in ups %}
-		
+		
 	{% endfor %}
 

 	
User
@{{vote.user.username}}'s profile picture{{vote.user.username}}
@{{vote.user.username}}'s profile picture{{vote.user.username}}

 
 
Downvotes

-

+

 
 	{% for vote in downs %}
-		
+		
 	{% endfor %}
 

 	
User
@{{vote.user.username}}'s profile picture{{vote.user.username}}
@{{vote.user.username}}'s profile picture{{vote.user.username}}