dfs

files/classes/mod_logs.py

@@ -153,6 +153,11 @@ ACTIONTYPES={
 		"icon": "fa-balance-scale",
 		"color": "bg-muted",
 	},
+	"change_sidebar": {
+		"str": "changed the sidebar",
+		"icon": "fa-columns",
+		"color": "bg-muted",
+	},
 	"ban_user":{
 		"str":'banned user {self.target_link}',
 		"icon":"fa-user-slash",
@@ -291,6 +296,11 @@ ACTIONTYPES2={
 		"icon": "fa-balance-scale",
 		"color": "bg-muted",
 	},
+	"change_sidebar": {
+		"str": "changed the sidebar",
+		"icon": "fa-columns",
+		"color": "bg-muted",
+	},
 	"ban_user":{
 		"str":'banned user {self.target_link}',
 		"icon":"fa-user-slash",

files/classes/submission.py

@@ -213,6 +213,7 @@ class Submission(Base):
 	@property
 	@lazy
 	def domain(self):
+		if not self.url: return None
 		if self.url.startswith('/'): return site
 		domain = urlparse(self.url).netloc
 		if domain.startswith("www."): domain = domain.split("www.")[1]

files/helpers/markdown.py

@@ -118,8 +118,28 @@ class Renderer(HTMLRenderer):
 class Renderer2(HTMLRenderer):
 
 	def __init__(self, **kwargs):
-		super().__init__(UserMention2)
+		super().__init__(UserMention2,
+						UserMention,
+						 SubMention,
+						 RedditorMention,
+						 SubMention2,
+						 RedditorMention2)
 		for i in kwargs: self.__dict__[i] = kwargs[i]
 
+	def render_user_mention2(self, token):
+		return f'<a href="/@{token.target}"><img loading="lazy" src="/@{token.target}/pic" class="pp20">@{token.target}</a>'
+
 	def render_user_mention(self, token):
-		return f'<a href="/@{token.target}"><img loading="lazy" src="/@{token.target}/pic" class="pp20">@{token.target}</a>'
+		space = token.target[0]
+		target = token.target[1]
+		return f"{space}@{target}"
+			
+	def render_sub_mention(self, token):
+		space = token.target[0]
+		target = token.target[1]
+		return f"{space}r/{target}"
+		
+	def render_redditor_mention(self, token):
+		space = token.target[0]
+		target = token.target[1]
+		return f"{space}u/{target}"

files/routes/admin.py

@@ -218,39 +218,39 @@ def monthly(v):
 	return {"message": "Monthly coins granted"}
 
 
-@app.get('/admin/rules')
+@app.get('/admin/sidebar')
 @admin_level_required(2)
-def get_rules(v):
+def get_sidebar(v):
 
 	try:
-		with open(f'rules_{SITE_NAME}.html', 'r') as f: rules = f.read()
+		with open(f'files/templates/sidebar_{SITE_NAME}.html', 'r') as f: sidebar = f.read()
 	except Exception:
-		rules = None
+		sidebar = None
 
-	return render_template('admin/rules.html', v=v, rules=rules)
+	return render_template('admin/sidebar.html', v=v, sidebar=sidebar)
 
 
-@app.post('/admin/rules')
+@app.post('/admin/sidebar')
 @limiter.limit("1/second")
 @admin_level_required(2)
 @validate_formkey
-def post_rules(v):
+def post_sidebar(v):
 
-	text = request.values.get('rules', '').strip()
+	text = request.values.get('sidebar', '').strip()
 
-	with open(f'rules_{SITE_NAME}.html', 'w+') as f: f.write(text)
+	with open(f'files/templates/sidebar_{SITE_NAME}.html', 'w+') as f: f.write(text)
 
-	with open(f'rules_{SITE_NAME}.html', 'r') as f: rules = f.read()
+	with open(f'files/templates/sidebar_{SITE_NAME}.html', 'r') as f: sidebar = f.read()
 
 	ma = ModAction(
-		kind="change_rules",
+		kind="change_sidebar",
 		user_id=v.id,
 	)
 	g.db.add(ma)
 
 	g.db.commit()
 
-	return render_template('admin/rules.html', v=v, rules=rules)
+	return render_template('admin/sidebar.html', v=v, sidebar=sidebar)
 
 
 @app.get("/admin/shadowbanned")
@@ -626,6 +626,8 @@ def admin_removed_comments(v):
 def agendaposter(user_id, v):
 	user = g.db.query(User).filter_by(id=user_id).first()
 
+	if user.username == '911roofer': abort(403)
+
 	expiry = request.values.get("days", 0)
 	if expiry:
 		expiry = float(expiry)

files/routes/awards.py

@@ -259,6 +259,7 @@ def award_post(pid, v):
 		else: post.stickied_utc = t
 		g.db.add(post)
 	elif kind == "agendaposter" and not (author.agendaposter and author.agendaposter_expires_utc == 0):
+		if author.username == "911roofer": abort(403)
 		if author.agendaposter_expires_utc and time.time() < author.agendaposter_expires_utc: author.agendaposter_expires_utc += 86400
 		else: author.agendaposter_expires_utc = time.time() + 86400
 		
@@ -435,6 +436,7 @@ def award_comment(cid, v):
 		else: c.is_pinned_utc = t
 		g.db.add(c)
 	elif kind == "agendaposter" and not (author.agendaposter and author.agendaposter_expires_utc == 0):
+		if author.username == "911roofer": abort(403)
 		if author.agendaposter_expires_utc and time.time() < author.agendaposter_expires_utc: author.agendaposter_expires_utc += 86400
 		else: author.agendaposter_expires_utc = time.time() + 86400
 		

files/routes/discord.py

@@ -17,7 +17,7 @@ SITE_NAME = environ.get("SITE_NAME", "").strip()
 @auth_required
 def join_discord(v):
 	
-	if v.is_suspended != 0 and v.admin_level == 0: return {"error": "Banned users cannot join the discord server!"}
+	if v.is_banned and not v.unban_utc: return {"error": "Permabanned users cannot join the discord server!"}
 	
 	if SITE_NAME == 'Drama' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: return f"You must receive 150 upvotes/downvotes from other users before being able to join the Discord server."
 	

files/routes/posts.py

@@ -590,10 +590,12 @@ def thumbnail_thread(pid):
 
 	post = db.query(Submission).filter_by(id=pid).first()
 	
-	if not post:
+	if not post or not post.url:
 		time.sleep(5)
 		post = db.query(Submission).filter_by(id=pid).first()
 
+	if not post or not post.url: return
+	
 	fetch_url = post.url
 
 	if fetch_url.startswith('/'): fetch_url = f"https://{site}{fetch_url}"

files/routes/static.py

@@ -26,20 +26,15 @@ def emojis(v):
 	else: template = 'CHRISTMAS/'
 	return render_template(f"{template}emojis.html", v=v, emojis=emojis)
 
-@app.get('/rules')
+@app.get('/sidebar')
 @auth_desired
-def static_rules(v):
+def sidebar(v):
 
-	if not path.exists(f'rules_{site_name}.html'):
-		if v and v.admin_level > 1:
-			return render_template('norules.html', v=v)
-		else:
-			abort(404)
+	if not path.exists(f'files/templates/sidebar_{site_name}.html'): abort(404)
 
-	with open(f'rules_{site_name}.html', 'r') as f:
-		rules = f.read()
+	with open(f'files/templates/sidebar_{site_name}.html', 'r') as f: sidebar = f.read()
 
-	return render_template('rules.html', rules=rules, v=v)
+	return render_template('sidebar.html', sidebar=sidebar, v=v)
 
 
 @app.get("/stats")

files/routes/users.py

@@ -741,7 +741,7 @@ def u_username_comments(username, v=None):
 		return render_template(f"{template}userpage_blocked.html", u=u, v=v)
 
 
-	page = int(request.values.get("page", "1"))
+	page = max(int(request.values.get("page", "1")), 1)
 	sort=request.values.get("sort","new")
 	t=request.values.get("t","all")
 

files/templates/CHRISTMAS/sidebars/HomeSidebar.html

@@ -4,59 +4,59 @@
 	set banner = [
 		{
 			'username': 'Bartholomew_1',
-			'image': '/static/assets/images/banners/1.webp?a=1'
+			'image': '1'
 		},
 		{
 			'username': 'Yui',
-			'image': '/static/assets/images/banners/2.webp?a=1'
+			'image': '2'
 		},
 		{
 			'username': 'Bartholomew_1',
-			'image': '/static/assets/images/banners/3.webp?a=1'
+			'image': '3'
 		},
 		{
 			'username': 'chiobu',
-			'image': '/static/assets/images/banners/4.webp?a=1'
+			'image': '4'
 		},
 		{
 			'username': 'chiobu',
-			'image': '/static/assets/images/banners/5.webp?a=1'
+			'image': '5'
 		},
 		{
 			'username': 'geese_suck',
-			'image': '/static/assets/images/banners/6.webp?a=1'
+			'image': '6'
 		},
 		{
 			'username': 'Bartholomew_1',
-			'image': '/static/assets/images/banners/7.webp?a=1'
+			'image': '7'
 		},
 		{
 			'username': 'drama_enthusiast',
-			'image': '/static/assets/images/banners/8.webp?a=1'
+			'image': '8'
 		},
 		{
 			'username': 'dramarama',
-			'image': '/static/assets/images/banners/9.webp?a=1'
+			'image': '9'
 		},
 		{
 			'username': 'geese_suck',
-			'image': '/static/assets/images/banners/10.webp?a=1'
+			'image': '10'
 		},
 		{
 			'username': 'ThreeLetterAgent',
-			'image': '/static/assets/images/banners/11.webp?a=1'
+			'image': '11'
 		},
 		{
 			'username': 'geese_suck',
-			'image': '/static/assets/images/banners/12.webp?a=1'
+			'image': '12'
 		},
 		{
 			'username': 'geese_suck',
-			'image': '/static/assets/images/banners/13.webp?a=1'
+			'image': '13'
 		},
 		{
 			'username': 'geese_suck',
-			'image': '/static/assets/images/banners/14.webp?a=1'
+			'image': '14'
 		}
 	]
 %}
@@ -119,7 +119,7 @@
 	</div>
 	<hr class="mt-6 mb-5 h-0.5 border-b border-gray-300 dark:border-gray-900 shadow-inset-t-white-05"/>
 	<a href="/post/32341/" class="block w-full h-56 shadow-sm p-[3px] bg-white dark:bg-gray-900 overflow-hidden">
-		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="{{ banner[random].image }}" alt="artwork featuring an orange and white cat"/>
+		<img class="w-full h-full flex-shrink-0 object-contain cursor-pointer" src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{banner[random].image}}.webp?a=1" alt="artwork featuring an orange and white cat"/>
 	</a>
 	<small class="mt-1 block text-gray-500">
 		Artwork by <a href="/@{{ banner[random].username }}" class="font-bold">@{{ banner[random].username }}</a>

files/templates/admin/admin_home.html

@@ -52,7 +52,7 @@
 
 <h4>Configuration</h4>
 <ul>
-	<li><a href="/admin/rules">Site Rules</a></li>
+	<li><a href="/admin/sidebar">Edit Sidebar</a></li>
 </ul>
 
 <div class="custom-control custom-switch">

files/templates/admin/alt_votes.html

@@ -72,7 +72,7 @@
 <p>Two accounts controlled by different people should have most uniqueness percentages at or above 70-80%</p>
 <p>A sockpuppet account will have its uniqueness percentages significantly lower.</p>
 
-<a type="button" role="button" class="btn btn-secondary" onclick="document.getElementById('linkbtn').classList.toggle('d-none');">Link Accounts</a>
+<a role="button" class="btn btn-secondary" onclick="document.getElementById('linkbtn').classList.toggle('d-none');">Link Accounts</a>
 <form action="/admin/link_accounts" method="post">
 	<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
 	<input autocomplete="off" type="hidden" name="u1" value="{{u1.id}}">

files/templates/admin/app.html

@@ -34,12 +34,12 @@
 		<div class="d-flex">
 			{% if not app.client_id%}
 
-				<a type="button" role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
-				<a type="button" role="button" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
+				<a role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
+				<a role="button" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
 
 			{% else %}
 
-				<a type="button" role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
+				<a role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
 			{% endif %}
 		</div>
 	</div>

files/templates/admin/apps.html

@@ -39,12 +39,12 @@
 		<div class="d-flex">
 			{% if not app.client_id %}
 
-				<a type="button" role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
-				<a type="button" role="button" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
+				<a role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
+				<a role="button" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
 
 			{% else %}
 
-				<a type="button" role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
+				<a role="button" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
 
 			{% endif %}
 		</div>

files/templates/admin/awards.html

@@ -14,7 +14,7 @@
 		<span>
 			{{error}}
 		</span>
-		<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+		<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 			<span aria-hidden="true"><i class="far fa-times"></i></span>
 		</button>
 	</div>
@@ -25,7 +25,7 @@
 		<span>
 			{{msg}}
 		</span>
-		<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+		<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 			<span aria-hidden="true"><i class="far fa-times"></i></span>
 		</button>
 	</div>
@@ -64,6 +64,6 @@
 
 	<pre></pre>
 	{% if 'rdrama.net' not in request.host or v.admin_level > 2 %}
-		<div><a class="btn btn-success" type="button" role="button" onclick="post_toast('/admin/monthly')">Grant Monthly Marseybux</a></div>
+		<div><a class="btn btn-success" role="button" onclick="post_toast('/admin/monthly')">Grant Monthly Marseybux</a></div>
 	{% endif %}
 {% endblock %}

files/templates/admin/badge_grant.html

@@ -14,7 +14,7 @@
 			<span>
 				{{error}}
 			</span>
-			<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+			<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>
@@ -25,7 +25,7 @@
 			<span>
 				{{msg}}
 			</span>
-			<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+			<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>

files/templates/admin/sidebar.html

@@ -1,31 +1,30 @@
-{% extends "default.html" %}
-
-{% block pagetitle %}Edit {{'SITE_NAME' | app_config}} rules{% endblock %}
-
-{% block content %}
-
-<div class="row my-5">
-	<div class="col col-md-8">
-		<div class="settings">
-			<div id="description">
-				<h2>Edit rules</h2>
-				<p>Your rules page will be publicly visible at <a href="/rules">{{'/rules'|full_link}}</a>.</p>
-				<p class="text-small text-muted">Supports <a href="https://www.markdownguide.org/basic-syntax">markdown syntax</a>.</p>
-			</div>
-			<div class="body d-lg-flex">
-				<div class="w-lg-100">
-					<form id="profile-settings" action="/admin/rules" method="post">
-						<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
-						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" aria-label="With textarea" placeholder="Site rules" rows="50" name="rules" form="profile-settings">{% if rules %}{{ rules }}{% endif %}</textarea>
-
-						<div class="d-flex mt-2">
-							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
+{% extends "default.html" %}
+
+{% block pagetitle %}Edit {{'SITE_NAME' | app_config}} sidebar{% endblock %}
+
+{% block content %}
+
+<div class="row my-5">
+	<div class="col col-md-8">
+		<div class="settings">
+			<div id="description">
+				<h2>Edit sidebar</h2>
+				<br>
+			</div>
+			<div class="body d-lg-flex">
+				<div class="w-lg-100">
+					<form id="profile-settings" action="/admin/sidebar" method="post">
+						<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
+						<textarea autocomplete="off" maxlength="10000" class="form-control rounded" id="bio-text" aria-label="With textarea" placeholder="Site sidebar" rows="50" name="sidebar" form="profile-settings">{% if sidebar %}{{ sidebar }}{% endif %}</textarea>
+
+						<div class="d-flex mt-2">
+							<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Save">
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
 {% endblock %}

files/templates/authforms.html

@@ -48,7 +48,7 @@
 
 				<nav class="navbar navbar-expand-lg navbar-dark bg-transparent fixed-top border-0">
 				<div class="container-fluid">
-						<button class="navbar-toggler d-none" type="button" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
+						<button class="navbar-toggler d-none" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
 								aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
 								<span class="navbar-toggler-icon"></span>
 						</button>
@@ -79,7 +79,7 @@
 													<span>
 													{{error}}
 													</span>
-													<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+													<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 														<span aria-hidden="true"><i class="far fa-times"></i></span>
 												</button>
 								</div>
@@ -90,7 +90,7 @@
 													<span>
 													{{msg}}
 													</span>
-													<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+													<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 														<span aria-hidden="true"><i class="far fa-times"></i></span>
 												</button>
 								</div>

files/templates/award_modal.html

@@ -4,7 +4,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title">Give Award</h5>
-				<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+				<button role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
 					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
@@ -14,9 +14,9 @@
 					<div class="card-columns award-columns awards-wrapper">
 						{% for award in v.user_awards %}
 							{% if award.owned %}
-								<a type="button" role="button" id="{{award.kind}}" class="card" onclick="bruh('{{award.kind}}')">
+								<a role="button" id="{{award.kind}}" class="card" onclick="bruh('{{award.kind}}')">
 							{% else %}
-								<a type="button" role="button" id="{{award.kind}}" class="card disabled">
+								<a role="button" id="{{award.kind}}" class="card disabled">
 							{% endif %}
 								<i class="{{award.icon}} {{award.color}}"></i>
 								<div class="pt-2" style="font-weight: bold; font-size: 14px; color:#E1E1E1">{{award.title}}</div>

files/templates/ban_modal.html

@@ -6,7 +6,7 @@
 		<div class="modal-content">
 			<div class="modal-header pt-3">
 				<h5 id="banModalTitle"></h5>
-				<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+				<button role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
 					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
@@ -30,8 +30,8 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
-				<button type="button" role="button" id="banUserButton" class="btn btn-danger" data-bs-dismiss="modal"></button>
+				<button role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
+				<button role="button" id="banUserButton" class="btn btn-danger" data-bs-dismiss="modal"></button>
 			</div>
 		</div>
 	</div>

files/templates/changelog.html

@@ -14,7 +14,7 @@
 			<div class="d-flex align-items-center sortingbarmargin">
 				<div class="text-small font-weight-bold mr-2">‎</div>
 				<div class="dropdown dropdown-actions">
-					<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						{% if t=="hour" %}<i class="fas fa-clock mr-1"></i>
 						{% elif t=="day" %}<i class="fas fa-calendar-day mr-1"></i>
 						{% elif t=="week" %}<i class="fas fa-calendar-week mr-1"></i>
@@ -36,7 +36,7 @@
 
 				<div class="text-small font-weight-bold ml-3 mr-2">‎</div>
 				<div class="dropdown dropdown-actions">
-					<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						{% if sort=="hot" %}<i class="fas fa-fire mr-1"></i>{% endif %}
 						{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
 						{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}
@@ -67,8 +67,8 @@
 {% block content %}
 
 {% if v %}
-	<a id="subscribe" class="{% if v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " type="button" role="button" onclick="post_toast2('/changelogsub','subscribe','unsubscribe')">Subscribe</a>
-	<a id="unsubscribe" class="{% if not v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " type="button" role="button" onclick="post_toast2('/changelogsub','subscribe','unsubscribe')">Unsubscribe</a>
+	<a id="subscribe" class="{% if v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " role="button" onclick="post_toast2('/changelogsub','subscribe','unsubscribe')">Subscribe</a>
+	<a id="unsubscribe" class="{% if not v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " role="button" onclick="post_toast2('/changelogsub','subscribe','unsubscribe')">Unsubscribe</a>
 {% endif %}
 
 <div class="row no-gutters {% if listing %}mt-md-3{% elif not listing %}my-md-3{% endif %}">

files/templates/comments.html

@@ -188,7 +188,7 @@
 				{% if c.bannedfor and c.author.banned_by %}
 					<a href="javascript:void(0)"><i class="fad fa-gavel text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="User was banned for this comment by @{{c.author.banned_by.username}}"></i></a>
 				{% endif %}
-				{% if c.active_flags %}<a class="btn btn-primary" style="padding:1px 5px; font-size:10px;" type="button" role="button" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags}} Reports</a>{% endif %}
+				{% if c.active_flags %}<a class="btn btn-primary" style="padding:1px 5px; font-size:10px;" href="javascript:void(0)" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags}} Reports</a>{% endif %}
 				{% if c.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 				{% if v and v.admin_level > 1 and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Shadowbanned by @{{c.author.shadowbanned}}"></i>{% endif %}
 				{% if c.is_pinned %}
@@ -203,7 +203,7 @@
 				{% if c.author.verified %}<i class="fas fa-badge-check align-middle ml-1" style="color:{% if c.author.verifiedcolor %}#{{c.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{c.author.verified}}"></i>
 				{% endif %}
 
-				<a class="user-name text-decoration-none" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover" type="button" role="button" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img alt="@{{c.author.username}}'s profile picture" loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level and 'rama' in request.host %}class="mod"{% endif %}>{{c.author.username}}</span></a>
+				<a class="user-name text-decoration-none" onclick='popclick({{c.author.json_popover(v) | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover" href="javascript:void(0)" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img alt="@{{c.author.username}}'s profile picture" loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level and 'rama' in request.host %}class="mod"{% endif %}>{{c.author.username}}</span></a>
 				{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{% if c.author.quadrant %}<img alt="{{c.author.quadrant}} quadrant" loading="lazy" height="20" src="/static/assets/images/quadrants/{{c.author.quadrant}}.webp?a=3">{% endif %}{{c.author.customtitle | safe}}</bdi>{% endif %}
 
 				{% if c.parent_comment_id and not standalone and level != 1 %}<a href="#comment-{{ c.parent_comment_id }}-only" class="text-muted ml-2"><i class="fas fa-reply fa-sm fa-fw fa-flip-horizontal mr-1"></i>{{ c.parent_comment.author.username }}</a>{% endif %}
@@ -222,7 +222,7 @@
 				<pre></pre>
 				<ul style="padding-left:20px; margin-bottom: 0;">
 					{% for f in c.ordered_flags %}
-						<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a type="button" role="button" onclick="post_toast('/del_report/c{{ f.id }}')">[remove]</a>{% endif %}</li>
+						<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a href="javascript:void(0)" onclick="post_toast('/del_report/c{{ f.id }}')">[remove]</a>{% endif %}</li>
 					{% endfor %}
 				</ul>
 			</div>
@@ -245,7 +245,7 @@
 
 
 				{% if not c.parent_submission and c.author_id!=NOTIFICATIONS_ID and c.author_id!=AUTOJANNY_ID and c.author_id!=v.id %}
-					<a class="btn btn-primary" type="button" role="button" onclick="openReplyBox('reply-m-{{c.id}}')">Reply</a>
+					<a class="btn btn-primary" href="javascript:void(0)" onclick="openReplyBox('reply-m-{{c.id}}')">Reply</a>
 					<pre></pre>
 					<div id="reply-m-{{c.id}}" class="d-none">
 						<div id="comment-form-space-{{c.id}}" class="comment-write collapsed child">		
@@ -257,7 +257,7 @@
 										<i id="emoji-reply-btn-{{c.id}}" class="fas fa-smile-beam" onclick="loadEmojis('reply-form-body-{{c.id}}')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Add Emoji"></i>
 									</label>
 								</div>
-								<a type="button" role="button" onclick="document.getElementById('reply-m-{{c.id}}').classList.add('d-none')" class="btn btn-link text-muted ml-auto cancel-form">Cancel</a> 
+								<a href="javascript:void(0)" onclick="document.getElementById('reply-m-{{c.id}}').classList.add('d-none')" class="btn btn-link text-muted ml-auto cancel-form">Cancel</a> 
 								<a id="save-reply-to-{{c.id}}" class="btn btn-primary text-white ml-2" onclick="post_reply('{{c.id}}');" href="javascript:void(0)">Reply</a> 
 							</form>
 						</div>
@@ -292,8 +292,8 @@
 								<input autocomplete="off" id="file-edit-reply-{{c.id}}" type="file" name="file" accept="image/*, video/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-edit-reply-{{c.id}}').innerHTML='image/video';" hidden>
 							</label>
 						</div>
-						<a type="button" role="button" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
-						<a id="cancel-edit-{{c.id}}" type="button" role="button" onclick="toggleEdit('{{c.id}}')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
+						<a href="javascript:void(0)" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
+						<a id="cancel-edit-{{c.id}}" href="javascript:void(0)" onclick="toggleEdit('{{c.id}}')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
 					</form>
 					<div id="preview-edit-{{c.id}}" class="preview-edit mb-3 mt-5"></div>
 					<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>Formatting help</a></div>
@@ -308,18 +308,18 @@
 							<ul class="list-inline text-right d-flex">
 								<li class="list-inline-item mr-auto">
 									{% if v and v.admin_level > 1 %}
-										<a type="button" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{c.id}}">
+										<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#adminModal-{{c.id}}">
 											<i class="fas fa-broom"></i>
 										</a>
 									{% endif %}
 								</li>
 																
 								{% if v %}
-									<a class="list-inline-item mr-3" type="button" role="button" onclick="openReplyBox('reply-to-{{c.id}}')"><i class="fas fa-reply"></i></a>
+									<a class="list-inline-item mr-3" href="javascript:void(0)" onclick="openReplyBox('reply-to-{{c.id}}')"><i class="fas fa-reply"></i></a>
 								{% endif %}
 								
 								<li class="list-inline-item">
-									<a type="button" role="button" data-bs-toggle="modal" data-bs-target="#actionsModal-{{c.id}}">
+									<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#actionsModal-{{c.id}}">
 										<i class="fas fa-ellipsis-h"></i>
 									</a>
 								</li>
@@ -339,12 +339,12 @@
 								{% elif v %}
 									<li id="voting-{{c.id}}-mobile" class="voting list-inline-item d-md-none">
 								
-										<span id="comment-mobile-{{c.id}}-up" tabindex="0" type="button" role="button" onclick="vote('comment-mobile', '{{c.id}}', '1')" class="mx-0 pr-1 arrow-up upvote-button comment-{{c.id}}-up {% if voted==1 %}active{% endif %}">
+										<span id="comment-mobile-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('comment-mobile', '{{c.id}}', '1')" class="mx-0 pr-1 arrow-up upvote-button comment-{{c.id}}-up {% if voted==1 %}active{% endif %}">
 										</span>
 								
 										<span id="comment-mobile-score-{{c.id}}" class="score comment-score-{{c.id}} {% if voted==1 %}score-up{% elif voted==-1%}score-down{% endif %}{% if c.controversial %} controversial{% endif %}"{% if not c.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="+{{ups}} | -{{downs}}"{% endif %}>{{score}}</span>
 								
-										<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-mobile-{{c.id}}-down" tabindex="0" type="button" role="button" onclick="vote('comment-mobile', '{{c.id}}', '-1')" class="mx-0 pl-1 my-0 arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}">
+										<span {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-mobile-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('comment-mobile', '{{c.id}}', '-1')" class="mx-0 pl-1 my-0 arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}">
 										</span>
 								
 									</li>
@@ -381,7 +381,7 @@
 							{% endif %}
 						{% elif v %}
 						
-							<button id="comment-{{c.id}}-up" tabindex="0" type="button" role="button" onclick="vote('comment', '{{c.id}}', '1')" class="btn caction py-0 m-0 pr-1 pl-2 nobackground arrow-up upvote-button mx-0 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}"></button>
+							<button id="comment-{{c.id}}-up" tabindex="0" href="javascript:void(0)" onclick="vote('comment', '{{c.id}}', '1')" class="btn caction py-0 m-0 pr-1 pl-2 nobackground arrow-up upvote-button mx-0 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}"></button>
 						
 						{% else %}
 							<button id="comment-{{c.id}}-up" tabindex="0" class="btn caction py-0 m-0 pr-1 pl-2 arrow-up" onclick="location.href='/login';"></button>
@@ -397,29 +397,29 @@
 								<li class=" arrow-down py-0 m-0 pl-1 pr-2 comment-{{c.id}}-down active"></li>
 							{% endif %}
 						{% elif v %}
-							<button {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" type="button" role="button" onclick="vote('comment', '{{c.id}}', '-1')" class="btn caction py-0 m-0 pl-1 pr-2 nobackground arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}"></button>
+							<button {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" onclick="vote('comment', '{{c.id}}', '-1')" class="btn caction py-0 m-0 pl-1 pr-2 nobackground arrow-down downvote-button comment-{{c.id}}-down {% if voted==-1 %}active{% endif %}"></button>
 						
 						{% else %}
 						
-							<button {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" type="button" role="button" class="btn caction py-0 m-0 pl-1 pr-2 nobackground arrow-down" onclick="location.href='/login';"></button>
+							<button {% if environ.get('DISABLE_DOWNVOTES') == '1' %}style="display:None!important"{% endif %} id="comment-{{c.id}}-down" tabindex="0" href="javascript:void(0)" class="btn caction py-0 m-0 pl-1 pr-2 nobackground arrow-down" onclick="location.href='/login';"></button>
 						
 						{% endif %}
 						
 						<a href="/votes?link={{c.fullname}}" class="btn caction nobackground px-1 text-muted"><i class="fas fa-arrows-v"></i>Votes</a>
 						
 						{% if v %}
-							<button class="btn caction py-0 nobackground px-1 text-muted" type="button" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</button>
+							<button class="btn caction py-0 nobackground px-1 text-muted" href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</button>
 							
-							<button id="unsave-{{c.id}}" class="btn {% if c.id in v.saved_comment_idlist() %}d-md-inline-block{% endif %} text-muted d-none" type="button" role="button" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Unsave</button>
+							<button id="unsave-{{c.id}}" class="btn {% if c.id in v.saved_comment_idlist() %}d-md-inline-block{% endif %} text-muted d-none" href="javascript:void(0)" onclick="post_toast3('/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Unsave</button>
 							
-							<button id="save-{{c.id}}" class="btn caction py-0 nobackground px-1 {% if c.id not in v.saved_comment_idlist() %}d-md-inline-block{% endif %} text-muted d-none" type="button" role="button" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Save</button>
+							<button id="save-{{c.id}}" class="btn caction py-0 nobackground px-1 {% if c.id not in v.saved_comment_idlist() %}d-md-inline-block{% endif %} text-muted d-none" href="javascript:void(0)" onclick="post_toast3('/save_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Save</button>
 							
-							<button class="btn caction py-0 nobackground px-1 text-muted" type="button" role="button" onclick="openReplyBox('reply-to-{{c.id}}')"><i class="fas fa-reply" aria-hidden="true"></i>Reply</button>
+							<button class="btn caction py-0 nobackground px-1 text-muted" href="javascript:void(0)" onclick="openReplyBox('reply-to-{{c.id}}')"><i class="fas fa-reply" aria-hidden="true"></i>Reply</button>
 						{% endif %}
 						
 						<a class="btn caction nobackground px-1 text-muted" href="{{c.permalink}}"><i class="fas fa-book-open"></i>Context</a>
 
-						<button class="btn caction py-0 nobackground px-1 text-muted copy-link" type="button" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://rdrama.com{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</button>
+						<button class="btn caction py-0 nobackground px-1 text-muted copy-link" href="javascript:void(0);" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://rdrama.com{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</button>
 
 						{% if v %}
 							<button class="btn caction py-0 nobackground px-1 text-muted" data-bs-toggle="modal" data-bs-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}',)"><i class="fas fa-flag fa-fw"></i>Report</button>
@@ -523,7 +523,7 @@
 						</label>
 					</div>
 					<a id="save-reply-to-{{c.fullname}}" class="btn btn-primary text-white ml-2 fl-r commentmob" onclick="post_comment('{{c.fullname}}', '{{c.post.id}}');" href="javascript:void(0)">Comment</a>
-					<a type="button" role="button" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('d-none')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
+					<a href="javascript:void(0)" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('d-none')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
 				</form>
 				<div id="reply-edit-{{c.id}}" class="mb-3 mt-5"></div>
 				<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>Formatting help</a></div>
@@ -563,7 +563,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title h6">More options</h5>
-				<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+				<button class="close" data-bs-dismiss="modal" aria-label="Close">
 					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
@@ -572,40 +572,40 @@
 
 					<a href="/votes?link={{c.fullname}}"><li class="list-group-item"><i class="fas fa-arrows-v"></i>Votes</li></a>
 
-					<a type="button" role="button" class="list-group-item copy-link" data-bs-dismiss="modal" data-clipboard-text="{% if 'rama' in request.host %}https://rdrama.com{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
+					<a href="javascript:void(0);" role="button" class="list-group-item copy-link" data-bs-dismiss="modal" data-clipboard-text="{% if 'rama' in request.host %}https://rdrama.com{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
 
 					<a class="list-group-item" href="{{c.permalink}}"><i class="fas fa-dna"></i>Context</a>
 
 					{% if v %}
-						<a type="button" role="button" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}')" class="list-group-item"><i class="fas fa-flag"></i>Report</a>
+						<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author.username}}')" class="list-group-item"><i class="fas fa-flag"></i>Report</a>
 
-						<a class="list-group-item" type="button" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</a>
+						<a class="list-group-item" href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/comment/{{c.id}}/awards')"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</a>
 
-						<a id="save2-{{c.id}}" class="list-group-item {% if c.id in v.saved_comment_idlist() %}d-none{% endif %}" type="button" role="button" data-bs-dismiss="modal" onclick="post_toast2('/save_comment/{{c.id}}','save2-{{c.id}}','unsave2-{{c.id}}')"><i class="fas fa-save"></i>Save</a>
+						<a id="save2-{{c.id}}" class="list-group-item {% if c.id in v.saved_comment_idlist() %}d-none{% endif %}" href="javascript:void(0)" data-bs-dismiss="modal" onclick="post_toast2('/save_comment/{{c.id}}','save2-{{c.id}}','unsave2-{{c.id}}')"><i class="fas fa-save"></i>Save</a>
 
-						<a id="unsave2-{{c.id}}" class="list-group-item {% if c.id not in v.saved_comment_idlist() %}d-none{% endif %}" type="button" role="button" onclick="post_toast2('/unsave_comment/{{c.id}}','save2-{{c.id}}','unsave2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-save"></i>Unsave</a>
+						<a id="unsave2-{{c.id}}" class="list-group-item {% if c.id not in v.saved_comment_idlist() %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/unsave_comment/{{c.id}}','save2-{{c.id}}','unsave2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-save"></i>Unsave</a>
 
 						{% if c.author_id == v.id %}
-							<a type="button" role="button" data-bs-dismiss="modal" onclick="toggleEdit('{{c.id}}')" class="list-group-item"><i class="fas fa-edit"></i>Edit</a>
+							<a href="javascript:void(0)" data-bs-dismiss="modal" onclick="toggleEdit('{{c.id}}')" class="list-group-item"><i class="fas fa-edit"></i>Edit</a>
 
 							{% if c.deleted_utc > 0 %}
-								<a type="button" role="button" onclick="post_toast('/undelete/comment/{{c.id}}')" data-bs-dismiss="modal" class="list-group-item"><i class="fas fa-trash-alt"></i>Undelete</a>
+								<a href="javascript:void(0)" onclick="post_toast('/undelete/comment/{{c.id}}')" data-bs-dismiss="modal" class="list-group-item"><i class="fas fa-trash-alt"></i>Undelete</a>
 							{% else %}
-								<a type="button" role="button" data-bs-toggle="modal" data-bs-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}')" class="list-group-item"><i class="fas fa-trash-alt"></i>Delete</a>
+								<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#deleteCommentModal" onclick="delete_commentModal('{{c.id}}')" class="list-group-item"><i class="fas fa-trash-alt"></i>Delete</a>
 							{% endif %}
 
-							<a id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Mark +18</a>
-							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Unmark +18</a>
+							<a id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Mark +18</a>
+							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Unmark +18</a>
 						{% else %}
-							<a id="unblock2-{{c.id}}" data-bs-dismiss="modal" class="text-success list-group-item {% if not c.is_blocking %}d-none{% endif %}" type="button" role="button" onclick="post_toast2('/settings/unblock?username={{c.author.username}}','block2-{{c.id}}','unblock2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-success"></i>Unblock user</a>
-							<a id="prompt2-{{c.id}}" data-bs-dismiss="modal" class="blockuser list-group-item d-none text-danger" type="button" role="button" onclick="post_toast2('/settings/block?username={{c.author.username}}','prompt2-{{c.id}}','unblock2-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-danger"></i>Are you sure?</a>
-							<a id="block2-{{c.id}}" class="{% if c.is_blocking %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="document.getElementById('block2-{{c.id}}').classList.toggle('d-none');document.getElementById('prompt2-{{c.id}}').classList.toggle('d-none');"><i class="fas fa-eye-slash fa-fw text-danger"></i>Block user</a>
+							<a id="unblock2-{{c.id}}" data-bs-dismiss="modal" class="text-success list-group-item {% if not c.is_blocking %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{c.author.username}}','block2-{{c.id}}','unblock2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-success"></i>Unblock user</a>
+							<a id="prompt2-{{c.id}}" data-bs-dismiss="modal" class="blockuser list-group-item d-none text-danger" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{c.author.username}}','prompt2-{{c.id}}','unblock2-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-danger"></i>Are you sure?</a>
+							<a id="block2-{{c.id}}" class="{% if c.is_blocking %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="document.getElementById('block2-{{c.id}}').classList.toggle('d-none');document.getElementById('prompt2-{{c.id}}').classList.toggle('d-none');"><i class="fas fa-eye-slash fa-fw text-danger"></i>Block user</a>
 						{% endif %}
 
 
 						{% if c.post and v.id == c.post.author_id and not v.admin_level %}
-							<a id="pin2-{{c.id}}" class="list-group-item {% if c.is_pinned %}d-none{% endif %} text-info" type="button" role="button" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Pin</a>
-							<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.is_pinned %}d-none{% endif %} text-info" type="button" role="button" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/unpin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Unpin</a>
+							<a id="pin2-{{c.id}}" class="list-group-item {% if c.is_pinned %}d-none{% endif %} text-info" href="javascript:void(0)" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Pin</a>
+							<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.is_pinned %}d-none{% endif %} text-info" href="javascript:void(0)" data-bs-target="#actionsModal-{{c.id}}" onclick="post_toast2('/unpin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Unpin</a>
 						{% endif %}
 					{% endif %}
 				</ul>
@@ -625,34 +625,34 @@
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title h6">Admin options</h5>
-					<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+					<button class="close" data-bs-dismiss="modal" aria-label="Close">
 						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
 				<div class="modal-body">
 					<ul class="list-group comment-actions">
 						{% if c.parent_submission %}
-							<a id="pin2-{{c.id}}" class="list-group-item {% if c.is_pinned %}d-none{% endif %} text-info" type="button" role="button" data-bs-target="#adminModal-{{c.id}}" onclick="post_toast2('/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Pin</a>
-							<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.is_pinned %}d-none{% endif %} text-info" type="button" role="button" data-bs-target="#adminModal-{{c.id}}" onclick="post_toast2('/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Unpin</a>
+							<a id="pin2-{{c.id}}" class="list-group-item {% if c.is_pinned %}d-none{% endif %} text-info" href="javascript:void(0)" data-bs-target="#adminModal-{{c.id}}" onclick="post_toast2('/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Pin</a>
+							<a id="unpin2-{{c.id}}" class="list-group-item {% if not c.is_pinned %}d-none{% endif %} text-info" href="javascript:void(0)" data-bs-target="#adminModal-{{c.id}}" onclick="post_toast2('/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info"></i>Unpin</a>
 
-							<a id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Mark +18</a>
-							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Unmark +18</a>
+							<a id="mark2-{{c.id}}" class="{% if c.over_18 %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Mark +18</a>
+							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="post_toast2('/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger"></i>Unmark +18</a>
 						{% endif %}
 
 						{% if v.id == c.author_id %}
-							<a id="distinguish2-{{c.id}}" class="list-group-item {% if c.distinguish_level %}d-none{% endif %} text-info" type="button" role="button" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Distinguish</a>
-							<a id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguish_level %}d-none{% endif %} text-info" type="button" role="button" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Undistinguish</a>
+							<a id="distinguish2-{{c.id}}" class="list-group-item {% if c.distinguish_level %}d-none{% endif %} text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Distinguish</a>
+							<a id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguish_level %}d-none{% endif %} text-info" href="javascript:void(0)" onclick="post_toast2('/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info"></i>Undistinguish</a>
 						{% else %}
 							<a id="ban2-{{c.id}}" class="{% if c.author.is_suspended %}d-none{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{ c.author.id }}', '{{c.author.username}}')" href="javascript:void(0)"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</a>
-							<a id="unban2-{{c.id}}" class="{% if not c.author.is_suspended %}d-none{% endif %} list-group-item text-success" type="button" role="button" onclick="post_toast2('/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success"></i>Unban user</a>
+							<a id="unban2-{{c.id}}" class="{% if not c.author.is_suspended %}d-none{% endif %} list-group-item text-success" href="javascript:void(0)" onclick="post_toast2('/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success"></i>Unban user</a>
 						{% endif %}
 
 						{% if "/reported/" in request.path %}
-							<a class="list-group-item text-danger" type="button" role="button" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
-							<a class="list-group-item text-success" type="button" role="button" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
+							<a class="list-group-item text-danger" href="javascript:void(0)" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
+							<a class="list-group-item text-success" href="javascript:void(0)" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
 						{% else %}
-							<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" type="button" role="button" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
-							<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}d-none{% endif %} list-group-item text-success" type="button" role="button" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
+							<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" href="javascript:void(0)" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger"></i>Remove</a>
+							<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}d-none{% endif %} list-group-item text-success" href="javascript:void(0)" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success"></i>Approve</a>
 						{% endif %}
 
 						{% if c.oauth_app %}
@@ -698,7 +698,7 @@
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title">Delete comment?</h5>
-					<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+					<button class="close" data-bs-dismiss="modal" aria-label="Close">
 						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
@@ -711,7 +711,7 @@
 					<p>Your comment will be removed everywhere on {{'SITE_NAME' | app_config}}. This action can be undone.</p>
 				</div>
 				<div class="modal-footer">
-					<button type="button" role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
+					<button class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
 					<button id="deleteCommentButton" class="btn btn-danger">Delete comment</button>
 				</div>
 			</div>
@@ -723,7 +723,7 @@
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title">Report <span id="comment-author"></span>'s comment</h5>
-					<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+					<button class="close" data-bs-dismiss="modal" aria-label="Close">
 						<span aria-hidden="true"><i class="far fa-times"></i></span>
 					</button>
 				</div>
@@ -735,8 +735,8 @@
 						<input autocomplete="off" maxlength="100" id="reason-comment" class="form-control">
 					</div>
 					<div class="modal-footer">
-						<button type="button" role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
-						<button type="button" role="button" id="reportCommentButton" class="btn btn-danger">Report comment</button>
+						<button class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
+						<button id="reportCommentButton" class="btn btn-danger">Report comment</button>
 					</div>
 				</div>
 				
@@ -746,7 +746,7 @@
 						<small class="form-text text-muted">We'll take it from here.</small>
 					</div>
 					<div class="modal-footer">
-						<button type="button" role="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
+						<button class="btn btn-primary" data-bs-dismiss="modal">Close</button>
 					</div>
 				</div>
 			</div>

files/templates/contact.html

@@ -12,7 +12,7 @@
 			<span>
 				{{msg if msg else request.values.get('msg')}}
 			</span>
-			<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+			<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 				<span aria-hidden="true"><i class="far fa-times"></i></span>
 			</button>
 		</div>

files/templates/default.html

@@ -274,38 +274,18 @@
 			{% endblock %}
 
 		</div>
-		{% block sidebar %}
-		
-			{% if request.path == '/' %}
-				<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
+		{% if request.path == '/' %}
+			{% block sidebar %}
+			<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
 				<div class="sidebar-section">
-					<img src="/static/assets/images/banners/{{range(1,69)|random()}}.webp?a=1" width=100%>
+					<img src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{range(1,69)|random()}}.webp?a=1" width=100%>
 					<a class="btn btn-primary btn-block mt-4" href="/submit">SUBMIT DRAMA!</a>
-
-					<p class="mt-4">Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.</p>
-
-					<p>Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.</p>
-
-					<p>rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all.</p>
-
-					What we want
-
-					<ul>
-						<li>Arguments.</li>
-						<li>Gossip.</li>
-						<li>Scandals.</li>
-						<li>Lolcows.</li>
-						<li>Assholes.</li>
-						<li>Trainwrecks.</li>
-						<li>Meltdowns.</li>
-						<li>Dramatic news articles.</li>
-						<li>Dramatic rumours (with context).</li>
-						<li>Dramatic everything from anywhere</li>
-					</ul>
-					</div>
+					{% set template = "sidebar_" + environ.get("SITE_NAME") + ".html" %}
+					{% include template %}
 				</div>
-			{% endif %}
-		  {% endblock %}	
+			</div>				
+			{% endblock %}
+		{% endif %}
 	</div>
 </div>
 

files/templates/delete_post_modal.html

@@ -5,7 +5,7 @@
 		<div class="modal-content">
 			<div class="modal-header d-none d-md-flex">
 				<h5 class="modal-title">Delete post?</h5>
-				<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+				<button role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
 					<span aria-hidden="true"><i class="far fa-times"></i></span>
 				</button>
 			</div>
@@ -23,16 +23,16 @@
 
 				<div class="d-md-none">
 
-					<button type="button" role="button" id="deletePostButton-mobile" class="btn btn-danger btn-block">Delete post</button>
+					<button role="button" id="deletePostButton-mobile" class="btn btn-danger btn-block">Delete post</button>
 
-					<button type="button" role="button" class="btn btn-secondary btn-block" data-bs-dismiss="modal">Cancel</button>
+					<button role="button" class="btn btn-secondary btn-block" data-bs-dismiss="modal">Cancel</button>
 
 				</div>
 
 			</div>
 			<div class="modal-footer d-none d-md-flex">
-				<button type="button" role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
-				<button type="button" role="button" id="deletePostButton" class="btn btn-danger">Delete post</button>
+				<button role="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
+				<button role="button" id="deletePostButton" class="btn btn-danger">Delete post</button>
 			</div>
 		</div>
 	</div>

files/templates/emoji_modal.html

@@ -34,7 +34,7 @@
 						</li>
 					</ul>
 				</div>
-				<button type="button" role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+				<button role="button" class="close" data-bs-dismiss="modal" aria-label="Close">
 					<i class="fal fa-times text-muted"></i>
 				</button>
 			</div>

files/templates/header.html

@@ -36,7 +36,7 @@
 			{% else %}
 			<a class="mobile-nav-icon d-md-none" href="/login"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
 			{% endif %}
-			<button class="navbar-toggler" type="button" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
+			<button class="navbar-toggler" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
 			aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon {% if v and v.notifications_count %}position-relative{% endif %}"><i class="fal fa-bars text-gray-500 black"></i>
 				{% if v and v.notifications_count %}
@@ -91,7 +91,7 @@
 
 				<li class="nav-item d-flex align-items-center justify-content-center text-center">
 					<div class="dropdown">
-						<a class="nav-link bg-transparent py-0 pr-0" type="button" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown"
+						<a class="nav-link bg-transparent py-0 pr-0" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown"
 						aria-haspopup="true" aria-expanded="false">
 						<div class="d-flex">
 							<div><img alt="your profile picture" loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div>
@@ -114,8 +114,6 @@
 							<div class="px-2">
 								<a class="dropdown-item" href="/static/assets/{{'SITE_NAME' | app_config}}.apk?a=4"><i class="fab fa-android fa-fw text-left mr-3"></i>Android app</a>
 
-								<a class="dropdown-item" href="/rules"><i class="fas fa-balance-scale fa-fw text-left mr-3"></i>Rules</a>
-
 								<a class="dropdown-item" href="/changelog"><i class="fas fa-clipboard fa-fw text-left mr-3"></i>Changelog</a>
 
 								<a class="dropdown-item" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw text-left mr-3"></i>Source code</a>
@@ -178,8 +176,6 @@
 			</li>
 			<a class="nav-item nav-link" href="/static/assets/{{'SITE_NAME' | app_config}}.apk?a=4"><i class="fab fa-android fa-fw mr-3"></i>Android app</a>
 
-			<a class="nav-item nav-link" href="/rules"><i class="fas fa-balance-scale fa-fw mr-3"></i>Rules</a>
-
 			<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="https://github.com/Aevann1/Drama"><i class="fab fa-github fa-fw mr-3"></i>Source code</a>
 
 			{% if request.host in ['rdrama.net', 'pcmemes.net'] %}

files/templates/home.html

@@ -42,7 +42,7 @@
 			<div class="d-flex align-items-center sortingbarmargin">
 				<div class="text-small font-weight-bold mr-2">‎</div>
 				<div class="dropdown dropdown-actions">
-					<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						{% if t=="hour" %}<i class="fas fa-clock mr-1"></i>
 						{% elif t=="day" %}<i class="fas fa-calendar-day mr-1"></i>
 						{% elif t=="week" %}<i class="fas fa-calendar-week mr-1"></i>
@@ -64,7 +64,7 @@
 
 				<div class="text-small font-weight-bold ml-3 mr-2">‎</div>
 				<div class="dropdown dropdown-actions">
-					<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						{% if sort=="hot" %}<i class="fas fa-fire mr-1"></i>{% endif %}
 						{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
 						{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}

files/templates/home_comments.html

@@ -11,7 +11,7 @@
 		<div class="d-flex px-2 align-items-center sortingbarmargin">
 			<div class="text-small font-weight-bold mr-2">‎</div>
 			<div class="dropdown dropdown-actions">
-				<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					{% if t=="hour" %}<i class="fas fa-clock mr-1"></i>
 					{% elif t=="day" %}<i class="fas fa-calendar-day mr-1"></i>
 					{% elif t=="week" %}<i class="fas fa-calendar-week mr-1"></i>
@@ -33,7 +33,7 @@
 
 			<div class="text-small font-weight-bold ml-3 mr-2">‎</div>
 			<div class="dropdown dropdown-actions">
-				<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-1"></i>{% endif %}
 					{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-1"></i>{% endif %}
 					{% if sort=="new" %}<i class="fas fa-sparkles mr-1"></i>{% endif %}

files/templates/log.html

@@ -55,7 +55,7 @@
 						<div class="text-small font-weight-bold mr-2">‎</div>
 						<div class="dropdown dropdown-actions">
 
-							<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 								{% if admin %}<img src="/@{{admin}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{admin}}{% else %}<img src="/static/assets/images/emojis/marseyjanny.webp" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All{% endif %}
 							</button>
 							<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
@@ -69,7 +69,7 @@
 						<div class="text-small font-weight-bold mr-2">‎</div>
 						<div class="dropdown dropdown-actions">
 
-							<button class="btn btn-secondary dropdown-toggle" type="button" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 								{% if type %}<i class="fas {{types[type]['icon']}} mr-2"></i>{{type}}{% else %}<i class="fas fa-broom mr-2"></i>All{% endif %}
 							</button>
 							<div class="dropdown-menu" aria-labelledby="dropdownMenuButton2s" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
@@ -105,7 +105,7 @@
 						</div>
 
 						<div class="text-gray-500">{{ma.age_string}} <a href="{{ma.permalink}}"><i class="far fa-link ml-1 text-muted"></i></a>
-							<a type="button" role="button" class="copy-link" role="button"data-clipboard-text="{{ma.permalink | full_link}}"><i class="far fa-copy ml-1 text-muted"></i></a>
+							<a role="button" class="copy-link" role="button"data-clipboard-text="{{ma.permalink | full_link}}"><i class="far fa-copy ml-1 text-muted"></i></a>
 						</div>
 
 					</div>

files/templates/login.html

@@ -28,7 +28,7 @@
 
 				<nav class="navbar navbar-expand-lg navbar-dark bg-transparent fixed-top border-0">
 				<div class="container-fluid">
-						<button class="navbar-toggler d-none" type="button" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
+						<button class="navbar-toggler d-none" role="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
 						aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
 						<span class="navbar-toggler-icon"></span>
 				</button>
@@ -65,7 +65,7 @@
 															<br>
 															<a href="/forgot" class="alert-link">Forgot password?</a>
 													</div>
-													<button type="button" role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
+													<button role="button" class="close" data-bs-dismiss="alert" aria-label="Close">
 														<span aria-hidden="true">&times;</span>
 												</button>
 												</div>