From 0f84e6033ef6db7fc1b2cd9187b7674c7917a10e Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 18 Apr 2022 19:20:10 +0200
Subject: [PATCH] fds

---
 files/assets/js/award_modal.js           |  9 ++++-----
 files/templates/award_modal.html         |  5 +++--
 files/templates/comments.html            | 12 +++++-------
 files/templates/header.html              |  4 ++--
 files/templates/post_actions.html        |  2 +-
 files/templates/post_actions_mobile.html |  2 +-
 files/templates/submission.html          |  9 ++++-----
 files/templates/submission_listing.html  |  8 +++-----
 8 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/files/assets/js/award_modal.js b/files/assets/js/award_modal.js
index 618ba7056..f8255ca05 100644
--- a/files/assets/js/award_modal.js
+++ b/files/assets/js/award_modal.js
@@ -1,3 +1,7 @@
+document.getElementById('awardModal').addEventListener('show.bs.modal', function (event) {
+  document.getElementById("awardTarget").action = event.relatedTarget.dataset.url;
+});
+
 function vote(type, id, dir, vid) {
 	const upvotes = document.getElementsByClassName(type + '-' + id + '-up');
 	const downvotes = document.getElementsByClassName(type + '-' + id + '-down');
@@ -84,11 +88,6 @@ function vote(type, id, dir, vid) {
 	xhr.send(form);
 }
 
-function awardModal(link) {
-	var target = document.getElementById("awardTarget");
-	target.action = link;
-}
-
 function pick(kind, canbuy1, canbuy2) {
 	let buy1 = document.getElementById('buy1')
 	if (canbuy1 && kind != "grass") buy1.disabled=false;
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 0df8c7052..15646b2f5 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -1,4 +1,3 @@
-<script src="/assets/js/award_modal.js?v=246" data-cfasync="false"></script>
 <div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered awardmodal my-5" role="document">
 		<div class="modal-content">
@@ -43,4 +42,6 @@
 			<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text2">Error, please try again later.</span>
 		</div>
 	</div>	
-</div>
\ No newline at end of file
+</div>
+
+<script src="/assets/js/award_modal.js?v=247" data-cfasync="false"></script>
\ No newline at end of file
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3a02b50f6..09f5d086c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -169,11 +169,9 @@
 			<div class="user-info">
 				<span class="comment-collapse-icon" onclick="collapse_comment('{{c.id}}', this.parentElement.parentElement.parentElement.parentElement)"></span>
 
-				{% if c.awards %}
-					{% for a in c.awards %}
-						<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
-					{% endfor %}
-				{% endif %}
+				{% for a in c.awards|reverse %}
+					<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
+				{% endfor %}
 
 				{% if c.post %}
 					{% set sub = c.post.sub %}
@@ -443,7 +441,7 @@
 
 							<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_name}}',)"><i class="fas fa-flag fa-fw"></i>Report</button>
 
-							<button class="btn caction py-0 nobackground px-1 text-muted" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/award_comment/{{c.id}}')"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</button>
+							<button class="btn caction py-0 nobackground px-1 text-muted" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" data-url="/award_comment/{{c.id}}"><i class="fas fa-gift" aria-hidden="true"></i>Give Award</button>
 							
 							<button id="unsave-{{c.id}}" class="btn caction py-0 nobackground px-1 {% if c.id in v.saved_comment_idlist() %}d-md-inline-block{% endif %} text-muted d-none" role="button" onclick="post_toast3(this,'/unsave_comment/{{c.id}}','save-{{c.id}}','unsave-{{c.id}}')"><i class="fas fa-save"></i>Unsave</button>
 							
@@ -645,7 +643,7 @@
 					{% if v %}
 						<a role="button" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportCommentModal" onclick="report_commentModal('{{c.id}}','{{c.author_name}}')" class="list-group-item"><i class="fas fa-flag mr-2"></i>Report</a>
 
-						<a class="list-group-item" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/award_comment/{{c.id}}')"><i class="fas fa-gift mr-2" aria-hidden="true"></i>Give Award</a>
+						<a class="list-group-item" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" data-url="/award_comment/{{c.id}}"><i class="fas fa-gift mr-2" 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 %}" role="button" data-bs-dismiss="modal" onclick="post_toast2(this,'/save_comment/{{c.id}}','save2-{{c.id}}','unsave2-{{c.id}}')"><i class="fas fa-save mr-2"></i>Save</a>
 
diff --git a/files/templates/header.html b/files/templates/header.html
index 3cdb0cabc..038f4ee7f 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -45,7 +45,7 @@
 				</a>
 			{% endif %}
 
-			<div class="flex-grow-1 d-fl d-none d-md-block">
+			<div class="flex-grow-1 d-fl d-none d-md-block {% if not v %}pad{% endif %}">
 				<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" {% if err %}style="margin-right:40rem!important"{% endif %} action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
 					<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
 					<span class="input-group-append">
@@ -83,7 +83,7 @@
 		</button>
 
 		<div class="collapse navbar-collapse" id="navbarResponsive">
-			<ul class="navbar-nav ml-auto d-none d-md-flex {% if not v %}pad{% endif %}">
+			<ul class="navbar-nav ml-auto d-none d-md-flex">
 
 				<li class="nav-item d-flex align-items-center justify-content-center text-center mx-1">
 					<a class="nav-link" href="/random_user/" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Random user"><i class="fas fa-music"></i></a>
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index 6258b926d..25f50ca81 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -9,7 +9,7 @@
 {% if not p.ghost or v.id == AEVANN_ID %}<a class="list-inline-item" href="/votes?link={{p.fullname}}"><i class="fas fa-arrows-v"></i>Votes</a>{% endif %}
 
 {% if v %}
-	<a class="list-inline-item text-muted d-none d-md-inline-block" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/award_post/{{p.id}}')"><i class="fas fa-gift fa-fw"></i>Give Award</a>
+	<a class="list-inline-item text-muted d-none d-md-inline-block" role="button" data-bs-toggle="modal" data-bs-target="#awardModal" data-url='/award_post/{{p.id}}'><i class="fas fa-gift fa-fw"></i>Give Award</a>
 {% endif %}
 
 <a class="list-inline-item copy-link" role="button" data-clipboard-text="{% if request.host == 'rdrama.net' %}https://chapotraphouse.club{{p.shortlink}}{% else %}{{p.permalink}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index be5bdc887..c461c9a9d 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -12,7 +12,7 @@
 
 <button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" onclick="report_postModal('{{p.id}}')"><i class="far fa-flag text-center text-muted mr-3"></i>Report</button>
 
-<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#awardModal" onclick="awardModal('/award_post/{{p.id}}')"><i class="fas fa-gift text-center text-muted mr-3"></i>Give Award</button>
+<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#awardModal" data-url='/award_post/{{p.id}}'><i class="fas fa-gift text-center text-muted mr-3"></i>Give Award</button>
 
 <button id="subscribe2-{{p.id}}" class="{% if p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast2(this,'/subscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye text-center text-muted mr-3"></i>Subscribe</button>
 <button id="unsubscribe2-{{p.id}}" class="{% if not p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast2(this,'/unsubscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-center text-muted mr-3"></i>Unsubscribe</button>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 229429213..9ad36aea4 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -620,11 +620,10 @@
 							<a role="button"><i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this post{% if p.author.banned_by %} by @{{p.author.banned_by.username}}{% endif %}"></i></a>
 						{% endif %}	
 
-						{% if p.awards %}
-							{% for a in p.awards %}
-								<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
-							{% endfor %}
-						{% endif %}
+						{% for a in p.awards|reverse %}
+							<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
+						{% endfor %}
+
 						{% if v and v.admin_level > 1 and p.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{p.author.shadowbanned}}"></i>{% endif %}
 
 						{% if p.stickied %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 53483c100..4a56f36b5 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -158,11 +158,9 @@
 					<a role="button"><i class="fas fa-hammer-crash text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="User was banned for this post{% if p.author.banned_by %} by @{{p.author.banned_by.username}}{% endif %}"></i></a>
 				{% endif %}
 
-				{% if p.awards %}
-					{% for a in p.awards %}
-						<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
-					{% endfor %}
-				{% endif %}
+				{% for a in p.awards|reverse %}
+					<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
+				{% endfor %}
 
 				{% if v and v.admin_level > 1 and p.author.shadowbanned %}
 					<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{p.author.shadowbanned}}"></i>