From f4e4ff3839aa621ccf86254fde0832172dac5f47 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 8 Sep 2022 17:38:27 +0200 Subject: [PATCH] comsetic shit --- files/helpers/const.py | 7 ++---- files/routes/users.py | 5 ---- files/templates/admin/awards.html | 4 ++-- files/templates/admin/badge_grant.html | 4 ++-- files/templates/admin/badge_remove.html | 4 ++-- files/templates/authforms.html | 4 ++-- files/templates/award_modal.html | 2 +- files/templates/ban_modal.html | 2 +- files/templates/category_modal.html | 2 +- files/templates/chat.html | 2 +- files/templates/comments.html | 18 +++++++------- files/templates/contact.html | 2 +- files/templates/delete_post_modal.html | 2 +- files/templates/header.html | 24 ++++++++++--------- files/templates/log.html | 4 ++-- files/templates/notifications.html | 4 ++-- files/templates/post_actions_mobile.html | 12 +++++----- .../templates/post_admin_actions_mobile.html | 16 ++++++------- files/templates/report_post_modal.html | 2 +- files/templates/settings.html | 6 ++--- files/templates/settings_blocks.html | 4 ++-- files/templates/settings_profile.html | 2 +- files/templates/settings_security.html | 2 +- files/templates/sub/settings.html | 4 ++-- files/templates/submission.html | 4 ++-- files/templates/submission_listing.html | 2 +- files/templates/userpage.html | 4 ++-- 27 files changed, 71 insertions(+), 77 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 5235c8454..0f4b13412 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -201,7 +201,6 @@ MOM_ID = 0 DONGER_ID = 0 GEESE_ID = 0 -BUG_THREAD = 0 POLL_THREAD = 0 WELCOME_MSG = f"Welcome to {SITE_NAME}!" ROLES={} @@ -257,7 +256,6 @@ if SITE == 'rdrama.net': DONGER_ID = 541 GEESE_ID = 1710 - BUG_THREAD = 18459 POLL_THREAD = 79285 WELCOME_MSG = "Hi there! It's me, your soon-to-be favorite rDrama user @carpathianflorist here to give you a brief rundown on some of the sick features we have here. ~You'll probably want to start by following me, though. So go ahead and click my name and then smash that Follow button. This is actually really important, so go on. Hurry.~ Actually, not enough of you were able to follow even the simplest of instructions, so now everyone is following me by default! If you'd like, you can still get some clicking practice in by hitting the unfollow button. But I'll be notified of that, and you're new, and you wouldn't want to get off on the wrong foot here, would you?\nThanks!\nNext up: If you're a member of the media, similarly just shoot me a DM and I'll set about verifying you and then we can take care of your sad journalism stuff.\n**FOR EVERYONE ELSE**\n Begin by navigating to [the settings page](/settings/profile) (we'll be prettying this up so it's less convoluted soon, don't worry) and getting some basic customization done.\n### Themes\nDefinitely change your theme right away, the default one (Midnight) is pretty enough, but why not use something *exotic* like Win98, or *flashy* like Tron? Even Coffee is super tasteful and way more fun than the default. More themes to come when we get around to it!\n### Avatar/pfp\nYou'll want to set this pretty soon. Set the banner too while you're at it. Your profile is important!\n### Flairs\nSince you're already on the settings page, you may as well set a flair, too. As with your username, you can - obviously - choose the color of this, either with a hex value or just from the preset colors. And also like your username, you can change this at any time. [Paypigs](https://marsey1.gumroad.com/l/rdrama) can even further relive the glory days of 90s-00s internet and set obnoxious signatures.\n### PROFILE ANTHEMS\nSpeaking of profiles, hey, remember MySpace? Do you miss autoplaying music assaulting your ears every time you visited a friend's page? Yeah, we brought that back. Enter a YouTube URL, wait a few seconds for it to process, and then BAM! you've got a profile anthem which people cannot mute. Unless they spend 20,000 dramacoin in the shop for a mute button. Which you can then remove from your profile by spending 40,000 dramacoin on an unmuteable anthem. Get fucked poors!\n### Dramacoin?\nDramacoin is basically our take on the karma system. Except unlike the karma system, it's not gay and boring and stupid and useless. Dramacoin can be spent at [Marsey's Dramacoin Emporium](/shop) on upgrades to your user experience (many more coming than what's already listed there), and best of all on tremendously annoying awards to fuck with your fellow dramautists. We're always adding more, so check back regularly in case you happen to miss one of the announcement posts.\nLike karma, dramacoin is obtained by getting upvotes on your threads and comments. *Unlike* karma, it's also obtained by getting downvotes on your threads and comments. Downvotes don't really do anything here - they pay the same amount of dramacoin and they increase thread/comment ranking just the same as an upvote. You just use them to express petty disapproval and hopefully start a fight. Because all votes are visible here. To hell with your anonymity.\nDramacoin can also be traded amongst users from their profiles. Note that there is a 3% transaction fee.\n### Badges\nRemember all those neat little metallic icons you saw on my profile when you were following me? If not, scroll back up and go have a look. And doublecheck to make sure you pressed the Follow button. Anyway, those are badges. You earn them by doing a variety of things. Some of them even offer benefits, like discounts at the shop. A [complete list of badges and their requirements can be found here](/badges), though I add more pretty regularly, so keep an eye on the [changelog](/h/changelog).\n### Other stuff\nWe're always adding new features, and we take a fun-first approach to development. If you have a suggestion for something that would be fun, funny, annoying - or best of all, some combination of all three - definitely make a thread about it. Or just DM me if you're shy. Weirdo. Anyway there's also the [leaderboards](/leaderboard), boring stuff like two-factor authentication you can toggle on somewhere in the settings page (psycho), the ability to save posts and comments, more than a thousand emojis already (most of which are rDrama originals), and on and on and on and on. This is just the basics, mostly to help you get acquainted with some of the things you can do here to make it more easy on the eyes, customizable, and enjoyable. If you don't enjoy it, just go away! We're not changing things to suit you! Get out of here loser! And no, you can't delete your account :na:\nI love you.
*xoxo Carp* 💋" @@ -291,7 +289,6 @@ elif SITE == 'pcmemes.net': AEVANN_ID = 1 SNAKES_ID = 2279 - BUG_THREAD = 4103 WELCOME_MSG = "Welcome to pcmemes.net! Don't forget to turn off the slur filter [here](/settings/content#slurreplacer)" LOTTERY_TICKET_COST = 12 @@ -596,7 +593,7 @@ AWARDS = { "kind": "bird", "title": "Bird Site", "description": "Forces the recipient to make all posts/comments < 140 characters for 24 hours.", - "icon": "fab fa-twitter", + "icon": "fas fa-twitter", "color": "text-blue", "price": 1500 }, @@ -676,7 +673,7 @@ AWARDS = { "kind": "unblockable", "title": "Unblockable", "description": "Makes the recipient unblockable and removes all blocks on them.", - "icon": "far fa-laugh-squint", + "icon": "fas fa-laugh-squint", "color": "text-lightgreen", "price": 20000 }, diff --git a/files/routes/users.py b/files/routes/users.py index ac62a161e..04ed66399 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -681,11 +681,6 @@ def unsubscribe(v, post_id): g.db.delete(sub) return {"message": "Post unsubscribed!"} -@app.get("/report_bugs") -@auth_required -def reportbugs(v): - return redirect(f'/post/{BUG_THREAD}') - @app.post("/@/message") @limiter.limit("1/second;10/minute;20/hour;50/day") @limiter.limit("1/second;10/minute;20/hour;50/day", key_func=lambda:f'{SITE}-{session.get("lo_user")}') diff --git a/files/templates/admin/awards.html b/files/templates/admin/awards.html index fe9c4bc2f..47868e62f 100644 --- a/files/templates/admin/awards.html +++ b/files/templates/admin/awards.html @@ -15,7 +15,7 @@ {{error}} {% endif %} @@ -26,7 +26,7 @@ {{msg}} {% endif %} diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index a6b2f8e13..b90e1268d 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -15,7 +15,7 @@ {{error}} {% endif %} @@ -26,7 +26,7 @@ {{msg}} {% endif %} diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index 98556ee4e..7101ec415 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -15,7 +15,7 @@ {{error}} {% endif %} @@ -26,7 +26,7 @@ {{msg}} {% endif %} diff --git a/files/templates/authforms.html b/files/templates/authforms.html index c774ad8ae..7cde21e41 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -76,7 +76,7 @@ {{error}} {% endif %} @@ -87,7 +87,7 @@ {{msg}} {% endif %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 7d384e7dd..017dfd61f 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -4,7 +4,7 @@
Give Award
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html index 7f1ab6a11..f9bdfc406 100644 --- a/files/templates/ban_modal.html +++ b/files/templates/ban_modal.html @@ -5,7 +5,7 @@
diff --git a/files/templates/category_modal.html b/files/templates/category_modal.html index 504bb6450..d678ae1fc 100644 --- a/files/templates/category_modal.html +++ b/files/templates/category_modal.html @@ -4,7 +4,7 @@
diff --git a/files/templates/chat.html b/files/templates/chat.html index 189742f81..935a9ed14 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -129,7 +129,7 @@
- + 0
diff --git a/files/templates/comments.html b/files/templates/comments.html index 1551be810..8c7f9ab9a 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -215,7 +215,7 @@
{% if c.active_flags(v) %}
- Reported by: + Reported by: 

 				
    
 					{% for f in c.filtered_flags(v) %}
@@ -549,8 +549,8 @@
 		

 
 	{% if request.path.startswith('/transfers') %}
-		
-		
+		
+		
 	{% endif %}
 
 	{% if render_replies %} 
@@ -608,7 +608,7 @@
 			

 				
More options

 				
 			

 			

@@ -634,9 +634,9 @@
 						{% if c.author_id == v.id %}
 							Edit
 							
-							Undelete
+							Undelete
 
-							Delete
+							Delete
 
 							Mark +18
 							Unmark +18
@@ -688,7 +688,7 @@
 				

 					
Admin options

 					
 				

 				

@@ -767,7 +767,7 @@
 			

 				
Delete comment?

 				
 			

 			

@@ -796,7 +796,7 @@
 					

 						
Report 's comment

 						
 					

 					

diff --git a/files/templates/contact.html b/files/templates/contact.html
index 11c5617f7..ffe145cdc 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -14,7 +14,7 @@
 				{{msg}}
 			
 			
 		

 	{% endif %}
diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html
index 30ca19d95..dd7fd4863 100644
--- a/files/templates/delete_post_modal.html
+++ b/files/templates/delete_post_modal.html
@@ -4,7 +4,7 @@
 			

 				
Delete post?

 				
 			

 			

diff --git a/files/templates/header.html b/files/templates/header.html
index 7b2a313dc..ad5cab068 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -232,21 +232,19 @@
 							

 							

 								{% if has_app -%}
-								Android app
+								Android app
 								{%- endif %}
 
 								Changelog
 
-								Source code
+								Source code
 
-								{% if SITE_NAME in ['rDrama', 'PCM'] %}
-									Bugs/Suggestions
-								{% endif %}
+								Bugs/Suggestions
 
 								{% if SITE_NAME == 'rDrama' %}
-									Discord
-									Fediverse
+									Discord
 								{% endif %}
+
 								{% if FEATURES['PROCOINS'] %}
 									Donate
 								{% endif %}
@@ -299,15 +297,19 @@
 				{% endif %}
 				
 				{% if has_app -%}
-					Android app
+					Android app
 				{%- endif %}
 
-				Source code
+				Changelog
+
+				Source code
+
+				Bugs/Suggestions
 
 				{% if SITE_NAME == 'rDrama' %}
-					Discord
-					Fediverse
+					Discord
 				{% endif %}
+
 				{% if FEATURES['PROCOINS'] %}
 					Donate
 				{% endif %}
diff --git a/files/templates/log.html b/files/templates/log.html
index 60aae0c3e..414eab65f 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -116,8 +116,8 @@
 
 						

 							{{ma.age_string}}
-							
-							
+							
+							
 						

 
 					

diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 7176eef42..6dc66f6a9 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -91,8 +91,8 @@
 
 						

 							{{ma.age_string}}
-							
-							
+							
+							
 						

 
 					

diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index e53da1b77..7e4a634d1 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -8,9 +8,9 @@
 
 {% if v and ((not p.ghost and v.admin_level >= PERMS['VOTES_VISIBLE']) or v.id == AEVANN_ID) %}{% endif %}
 
-
+
 
-
+
 
 {% if FEATURES['AWARDS'] -%}
 
@@ -34,9 +34,9 @@
 	{% endif %}
 
 
-	
+	
 
-	
+	
 
 
 	{% if FEATURES['COUNTRY_CLUB'] -%}
@@ -44,8 +44,8 @@
 	
 	{%- endif %}
 
-	
-	
+	
+	
 {% else %}
 
 	{% if not p.ghost %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index b7547b2b8..97e51fa90 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -10,7 +10,7 @@
 			

 				
    
 					{% if (request.path.startswith('/post/') or request.path.startswith('/h/')) and v.admin_level > 2 and p.id %}
-						
+						
 					{% endif %}
 
 					{% if FEATURES['COUNTRY_CLUB'] -%}
@@ -31,19 +31,19 @@
 					
 
 					{% if "/reported/" in request.path %}
-						
-						
+						
+						
 					{% else %}
-						
-						
+						
+						
 					{% endif %}
 
 					{% if p.oauth_app %}
-						
+						
 					{% endif %}
 
-					
-					
+					
+					
 
 					{% if v.id != p.author_id %}
 						
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 61edbdb30..cf88fd8a1 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -4,7 +4,7 @@
 			
    
 				
    Report post
    
 				
 			
    
 			
    
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 13a59dad2..bf563998a 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -76,7 +76,7 @@
 				{{error}}
 			
 			
 		
    
 		{% endif %}
@@ -87,7 +87,7 @@
 				{{msg}}
 			
 			
 		

 		{% endif %}
@@ -173,7 +173,7 @@
 				

 					
{% if mfa_secret %}Setup two-step login{% elif mfa_secret and not v.email %}Email required for two-step login{% else %}Disable two-step login{% endif %}

 					
 				

 				{% if mfa_secret %}
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index 0ac75789d..f1dd541e5 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -15,7 +15,7 @@
 				{{error}}
 			
 			
 		

 		{% endif %}
@@ -89,7 +89,7 @@
 				

 					
Block users

 					
 				

 				

diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 5a3fe19a6..fa64a6144 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -295,7 +295,7 @@
 
 							
 								
-									{{v.referral_count}}
+									{{v.referral_count}}
 								
 
 							

diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index 079f6381f..2aeacf943 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -226,7 +226,7 @@
 

 	
Delete your {{SITE_NAME}} account

 	
 

 

diff --git a/files/templates/sub/settings.html b/files/templates/sub/settings.html
index 11b414e29..a23921ccc 100644
--- a/files/templates/sub/settings.html
+++ b/files/templates/sub/settings.html
@@ -11,7 +11,7 @@
 		{{error}}
 	
 	
 

 {% endif %}
@@ -23,7 +23,7 @@
 			{{msg}}
 		
 		
 	

 {% endif %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 3d2339177..fbe7119c2 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -580,7 +580,7 @@
 				

 					
    
 						{% if v.id==p.author_id %}
-							
+							
 						{% elif p.body %}
 							
 						{% endif %}
@@ -699,7 +699,7 @@
 					

 					{% if p.active_flags(v) %}
 					

-						 Reported by:
+						 Reported by:
 						

 						
    
 							{% for f in p.filtered_flags(v) %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index e8c3e7681..6c5b3e29d 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -33,7 +33,7 @@
 
 {% if p.active_flags(v) %}
 	
    
-		 Reported by:
+		 Reported by:
 		
    
 		
      
 			{% for f in p.filtered_flags(v) %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 9d6abfcef..e3d709e11 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -91,7 +91,7 @@
 								
      
 									
 							
      
 							{% endif %}
@@ -99,7 +99,7 @@