From fbb32201b4da54baabd4e7acae2c7afb30c33b46 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Sun, 12 Sep 2021 04:51:20 +0200
Subject: [PATCH] fd

---
 files/templates/admin/app.html        |   6 +-
 files/templates/admin/user_award.html | 104 +++++++++++-----------
 files/templates/changelog.html        |   3 +-
 files/templates/settings_filters.html |   4 +-
 files/templates/user_listing.html     |   4 +-
 files/templates/userpage.html         | 120 ++++++++++++--------------
 6 files changed, 116 insertions(+), 125 deletions(-)

diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html
index a4bf4106a..6c6e9dd10 100644
--- a/files/templates/admin/app.html
+++ b/files/templates/admin/app.html
@@ -34,12 +34,12 @@
 		<div class="d-flex">
 			{% if not app.client_id%}
 
-			<a href="javascript:void(0)" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
-			<a href="javascript:void(0)" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
+				<a href="javascript:void(0)" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/approve/{{app.id}}')">Approve</a>
+				<a href="javascript:void(0)" class="btn btn-secondary mr-0" onclick="post_toast('/admin/app/reject/{{app.id}}')">Reject</a> 
 
 			{% else %}
 
-			<a href="javascript:void(0)" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
+				<a href="javascript:void(0)" class="btn btn-primary ml-auto" onclick="post_toast('/admin/app/revoke/{{app.id}}')">Revoke</a>
 			{% endif %}
 		</div>
 	</div>
diff --git a/files/templates/admin/user_award.html b/files/templates/admin/user_award.html
index 6e735271e..49ab9451f 100644
--- a/files/templates/admin/user_award.html
+++ b/files/templates/admin/user_award.html
@@ -8,64 +8,64 @@
 
 {% block content %}
 
-		{% if error %}
-		<div class="alert alert-danger alert-dismissible fade show my-3" role="alert">
-			<i class="fas fa-exclamation-circle my-auto"></i>
-			<span>
-				{{error}}
-			</span>
-			<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="far fa-times"></i></span>
-			</button>
-		</div>
-		{% endif %}
-		{% if msg %}
-		<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
-			<i class="fas fa-check-circle my-auto" aria-hidden="true"></i>
-			<span>
-				{{msg}}
-			</span>
-			<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="far fa-times"></i></span>
-			</button>
-		</div>
-		{% endif %}
+	{% if error %}
+	<div class="alert alert-danger alert-dismissible fade show my-3" role="alert">
+		<i class="fas fa-exclamation-circle my-auto"></i>
+		<span>
+			{{error}}
+		</span>
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
+		</button>
+	</div>
+	{% endif %}
+	{% if msg %}
+	<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
+		<i class="fas fa-check-circle my-auto" aria-hidden="true"></i>
+		<span>
+			{{msg}}
+		</span>
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true"><i class="far fa-times"></i></span>
+		</button>
+	</div>
+	{% endif %}
 
-<pre></pre>
-<pre></pre>
-<h5>User Award Grant</h5>
+	<pre></pre>
+	<pre></pre>
+	<h5>User Award Grant</h5>
 
-<form action="/admin/user_award", method="post">
-<input type="hidden" name="formkey" value="{{v.formkey}}">
+	<form action="/admin/user_award", method="post">
+	<input type="hidden" name="formkey" value="{{v.formkey}}">
 
 
-<label for="input-username">Username</label><br>
-<input id="input-username" class="form-control mb-3" type="text" name="username" required>
+	<label for="input-username">Username</label><br>
+	<input id="input-username" class="form-control mb-3" type="text" name="username" required>
 
-<table class="table table-striped">
-<thead class="bg-primary text-white">
-		<tr>
-			<th scope="col">Icon</th>
-			<th scope="col">Title</th>
-			<th scope="col">Amount</th>
-		</tr>
-	</thead>
-	<tbody>
-{% for a in awards %}
-<tr>
-	<td><i class="{{a['icon']}} {{a['color']}}" style="font-size: 30px"></i></td>
-	<td style="font-weight: bold">{{a['title']}}</td>
-	<td><input type="number" class="form-control" name="{{a['kind']}}" value="0" placeholder="enter amount" /></td>
-</tr>
-{% endfor %}
-</table>
+	<table class="table table-striped">
+	<thead class="bg-primary text-white">
+			<tr>
+				<th scope="col">Icon</th>
+				<th scope="col">Title</th>
+				<th scope="col">Amount</th>
+			</tr>
+		</thead>
+		<tbody>
+	{% for a in awards %}
+	<tr>
+		<td><i class="{{a['icon']}} {{a['color']}}" style="font-size: 30px"></i></td>
+		<td style="font-weight: bold">{{a['title']}}</td>
+		<td><input type="number" class="form-control" name="{{a['kind']}}" value="0" placeholder="enter amount" /></td>
+	</tr>
+	{% endfor %}
+	</table>
 
-<input class="btn btn-primary mt-3" type="submit" value="Grant Awards">
+	<input class="btn btn-primary mt-3" type="submit" value="Grant Awards">
 
-</form>
+	</form>
 
-<pre></pre>
-{% if v.id in [1,12,28,29,747,995] %}
-	<div><a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/admin/monthly')">Grant Monthly Awards</a></div>
-{% endif %}
+	<pre></pre>
+	{% if v.id in [1,12,28,29,747,995] %}
+		<div><a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/admin/monthly')">Grant Monthly Awards</a></div>
+	{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index 9070e0f76..cdc9ede94 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -66,7 +66,8 @@
 {% block content %}
 
 {% if v %}
-<a class="btn btn-primary followbutton " href="javascript:void(0)" onclick="post_toast('/changelogsub')">{{"Unsubscribe" if v.changelogsub else "Subscribe"}}</a>
+	<a id="subscribe" class="{% if v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " href="javascript:void(0)" onclick="post_toast2('/changelogsub','subscribe','unsubscribe')">Subscribe</a>
+	<a id="unsubscribe" class="{% if not v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " href="javascript:void(0)" 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 %}">
diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html
index 30889547a..15c967574 100644
--- a/files/templates/settings_filters.html
+++ b/files/templates/settings_filters.html
@@ -25,7 +25,7 @@
 							<div class="input-group mb2">
 								<select id='defaultsortingcomments' class="form-control" form="profile-settings" name="defaultsortingcomments" onchange="post_toast('/settings/profile?defaultsortingcomments='+document.getElementById('defaultsortingcomments').value)">
 								{% for entry in ["new", "old", "top", "bottom", "controversial", "random"] %}
-								<option value="{{entry}}"{{' selected' if v.defaultsortingcomments==entry else ''}}>{{entry}}</option>
+									<option value="{{entry}}"{{' selected' if v.defaultsortingcomments==entry else ''}}>{{entry}}</option>
 								{% endfor %}
 							</select>
 							</div>
@@ -63,7 +63,7 @@
 							<div class="input-group mb2">
 								<select id='defaulttime' class="form-control" form="profile-settings" name="defaulttime" onchange="post_toast('/settings/profile?defaulttime='+document.getElementById('defaulttime').value)">
 								{% for entry in ["hour", "day", "week", "month", "year", "all"] %}
-								<option value="{{entry}}"{{' selected' if v.defaulttime==entry else ''}}>{{entry}}</option>
+									<option value="{{entry}}"{{' selected' if v.defaulttime==entry else ''}}>{{entry}}</option>
 								{% endfor %}
 							</select>
 							</div>
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 5df4b34d8..22d7d8525 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -13,9 +13,9 @@
 
 					{% if v %}
 						{% if v.id!=u.id and not u.is_private and not u.is_nofollow %}
-						<div id="button-sub-{{u.id}}" style="z-index: 2" class="{% if u.has_follower(v) %}d-none{% endif %}"><a class="btn btn-primary " href="javascript:void(0)" onclick="post_toast('/follow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Follow</a></div>
+						<div id="button-sub-{{u.id}}" style="z-index: 2" class="{% if u.has_follower(v) %}d-none{% endif %}"><a class="btn btn-primary " href="javascript:void(0)" onclick="post_toast2('/follow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Follow</a></div>
 
-						<div id="button-unsub-{{u.id}}" style="z-index: 2" class="{% if not u.has_follower(v) %} d-none{% endif %}"><a class="btn btn-secondary " href="javascript:void(0)" onclick="post_toast('/unfollow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Unfollow</a></div>
+						<div id="button-unsub-{{u.id}}" style="z-index: 2" class="{% if not u.has_follower(v) %} d-none{% endif %}"><a class="btn btn-secondary " href="javascript:void(0)" onclick="post_toast2('/unfollow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Unfollow</a></div>
 						{% endif %}
 					{% else %}
 					<div id="button-sub-{{u.id}}" style="z-index: 2" "><a class="btn btn-primary " href="/signup?redirect={{request.path}}">Follow</a></div>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index d1ab52f2e..39a881b77 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -202,22 +202,22 @@
 						{% endif %}
 
 						{% if 'rdrama' in request.host and v.id in [1,12,28,29,747,995] %} 
-							{% if u.admin_level == 0 %}
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_admin')">Make admin</a>
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_fake_admin')">Make fake admin</a>
-							{% elif u.admin_level == 1 %}
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_fake_admin')">Remove fake admin</a>
-							{% else %}
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_admin')">Remove admin</a>
+							<a id="admin" class="{% if u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_admin','admin','unadmin')">Make admin</a>
+							<a id="unadmin" class="{% if not u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_admin','admin','unadmin')">Remove admin</a>
+
+							<a id="fakeadmin" class="{% if u.admin_level == 1%}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_fake_admin','fakeadmin','unfakeadmin')">Make admin</a>
+							<a id="unfakeadmin" class="{% if u.admin_level != 1 %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_fake_admin','fakeadmin','unfakeadmin')">Remove admin</a>
+
+							{% if u.admin_level == 6 %}
 								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/revert_actions')">Revert admin actions</a>
 							{% endif %}
 						{% endif %}
 
 						{% if 'rdrama' not in request.host and 'pcm' not in request.host and v.admin_level == 6 %}
-							{% if u.admin_level == 0 %}
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_admin')">Make admin</a>
-							{% else %}
-								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_admin')">Remove admin</a>
+							<a id="admin" class="{% if u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_admin','admin','unadmin')">Make admin</a>
+							<a id="unadmin" class="{% if not u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_admin','admin','unadmin')">Remove admin</a>
+
+							{% if u.admin_level %}
 								<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/revert_actions')">Revert admin actions</a>
 							{% endif %}
 						{% endif %}
@@ -295,31 +295,25 @@
 						
 						<pre></pre>
 
-						{% if u.agendaposter %}
-							<a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/agendaposter/{{u.id}}?toast')">Disable Agendaposter Theme</a>
-						{% else %}
-							<form action="/agendaposter/{{u.id}}" method="post">
-								<input type="hidden" name="formkey", value="{{v.formkey}}">
-								<input type="number" name="days" class="form-control" placeholder="Days (0 or blank = permanent)" />
-								<input type="submit" class="btn btn-danger" value="Lock Agendaposter Theme" />
-							</form>
-						{% endif %}
-						
-						<pre></pre>
-
-						{% if u.shadowbanned %} 
-							<a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/unshadowban/{{u.id}}')">Unshadowban</a>
-						{% else %}
-							<a class="btn btn-danger" href="javascript:void(0)" onclick="post_toast('/shadowban/{{u.id}}')">Shadowban</a>
-						{% endif %}
+						<form id="agendaposter" class="{% if u.agendaposter %}d-none{% endif %}" action="/agendaposter/{{u.id}}" method="post">
+							<input type="hidden" name="formkey", value="{{v.formkey}}">
+							<input type="number" name="days" class="form-control" placeholder="Days (0 or blank = permanent)" />
+							<input type="submit" class="btn btn-danger" value="Lock Agendaposter Theme" />
+						</form>
+					
+						<a id="unagendaposter" class="{% if not u.agendaposter %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/agendaposter/{{u.id}}','agendaposter','unagendaposter')">Disable Agendaposter Theme</a>
 
 						<pre></pre>
 
-						{% if u.verified %}
-							<a class="btn btn-danger" href="javascript:void(0)" onclick="post_toast('/admin/unverify/{{u.id}}')">Unverify</a>
-						{% else %}
-							<a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/admin/verify/{{u.id}}')">Verify</a>
-						{% endif %}
+						<a id="shadowban" class="{% if u.shadowbanned %}d-none{% endif %} btn btn-danger" href="javascript:void(0)" onclick="post_toast2('/shadowban/{{u.id}}','shadowban','unshadowban')">Shadowban</a>
+
+						<a id="unshadowban" class="{% if not u.shadowbanned %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/unshadowban/{{u.id}}','shadowban','unshadowban')">Unshadowban</a>
+
+
+						<pre></pre>
+
+						<a id="verify" class="{% if u.verified %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/admin/verify/{{u.id}}','verify','unverify')">Verify</a>
+						<a id="unverify" class="{% if not u.verified %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/admin/unverify/{{u.id}}','verify','unverify')">Unverify</a>
 
 						<pre></pre>
 						<form action="/admin/unnuke_user" method="post">
@@ -468,22 +462,22 @@
 					{% endif %}
 
 					{% if 'rdrama' in request.host and v.id in [1,12,28,29,747,995] %} 
-						{% if u.admin_level == 0 %}
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_admin')">Make admin</a>
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_fake_admin')">Make fake admin</a>
-						{% elif u.admin_level == 1 %}
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_fake_admin')">Remove fake admin</a>
-						{% else %}
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_admin')">Remove admin</a>
+						<a id="admin2" class="{% if u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_admin','admin2','unadmin2')">Make admin</a>
+						<a id="unadmin2" class="{% if not u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_admin','admin2','unadmin2')">Remove admin</a>
+
+						<a id="fakeadmin2" class="{% if u.admin_level == 1%}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_fake_admin','fakeadmin2','unfakeadmin2')">Make admin</a>
+						<a id="unfakeadmin2" class="{% if u.admin_level != 1 %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_fake_admin','fakeadmin2','unfakeadmin2')">Remove admin</a>
+
+						{% if u.admin_level == 6 %}
 							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/revert_actions')">Revert admin actions</a>
 						{% endif %}
 					{% endif %}
 
 					{% if 'rdrama' not in request.host and 'pcm' not in request.host and v.admin_level == 6 %}
-						{% if u.admin_level == 0 %}
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/make_admin')">Make admin</a>
-						{% else %}
-							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/remove_admin')">Remove admin</a>
+						<a id="admin" class="{% if u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/make_admin','admin','unadmin')">Make admin</a>
+						<a id="unadmin" class="{% if not u.admin_level %}d-none{% endif %} btn btn-primary" href="javascript:void(0)" onclick="post_toast2('/@{{u.username}}/remove_admin','admin','unadmin')">Remove admin</a>
+
+						{% if u.admin_level %}
 							<a class="btn btn-primary" href="javascript:void(0)" onclick="post_toast('/@{{u.username}}/revert_actions')">Revert admin actions</a>
 						{% endif %}
 					{% endif %}
@@ -562,29 +556,25 @@
 						
 						<pre></pre>
 
-						{% if u.agendaposter %}
-							<a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/agendaposter/{{u.id}}?toast')">Disable Agendaposter Theme</a>
-						{% else %}
-							<form action="/agendaposter/{{u.id}}" method="post">
-								<input type="hidden" name="formkey", value="{{v.formkey}}">
-								<input type="number" name="days" class="form-control" placeholder="Days (0 or blank = permanent)" />
-								<input type="submit" class="btn btn-danger" value="Lock Agendaposter Theme" />
-							</form>
-						{% endif %}
-						
+						<form id="agendaposter2" class="{% if u.agendaposter %}d-none{% endif %}" action="/agendaposter/{{u.id}}" method="post">
+							<input type="hidden" name="formkey", value="{{v.formkey}}">
+							<input type="number" name="days" class="form-control" placeholder="Days (0 or blank = permanent)" />
+							<input type="submit" class="btn btn-danger" value="Lock Agendaposter Theme" />
+						</form>
+					
+						<a id="unagendaposter2" class="{% if not u.agendaposter %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/agendaposter/{{u.id}}','agendaposter2','unagendaposter2')">Disable Agendaposter Theme</a>
+
 						<pre></pre>
 
-						{% if u.shadowbanned %} 
-							<a class="btn btn-success" href="javascript:void(0)" onclick="post_toast('/unshadowban/{{u.id}}')">Unshadowban</a>
-						{% else %}
-							<a class="btn btn-danger" href="javascript:void(0)" onclick="post_toast('/shadowban/{{u.id}}')">Shadowban</a>
-						{% endif %}
-						
-						{% if u.verified %}
-							<a class="btn btn-danger" href="javasript:void(0)" onclick="post_toast('/admin/unverify/{{u.id}}')">Unverify</a>
-						{% else %}
-							<a class="btn btn-success" href="javasript:void(0)" onclick="post_toast('/admin/verify/{{u.id}}')">Verify</a>
-						{% endif %}
+						<a id="shadowban2" class="{% if u.shadowbanned %}d-none{% endif %} btn btn-danger" href="javascript:void(0)" onclick="post_toast2('/shadowban/{{u.id}}','shadowban2','unshadowban2')">Shadowban</a>
+
+						<a id="unshadowban" class="{% if not u.shadowbanned %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/unshadowban/{{u.id}}','shadowban2','unshadowban2')">Unshadowban</a>
+
+
+						<pre></pre>
+
+						<a id="verify2" class="{% if u.verified %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/admin/verify/{{u.id}}','verify2','unverify2')">Verify</a>
+						<a id="unverify2" class="{% if not u.verified %}d-none{% endif %} btn btn-success" href="javascript:void(0)" onclick="post_toast2('/admin/unverify/{{u.id}}','verify2','unverify2')">Unverify</a>
 
 						<pre></pre>
 						<form action="/admin/unnuke_user" method="post">