From 9cb397bdf33316dab9c8b261d73ffa35723d8ea3 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Fri, 6 Oct 2023 17:32:40 +0300
Subject: [PATCH] add emoji button to report modal and award modal

---
 files/assets/js/emoji_modal.js          | 7 +++++++
 files/templates/comments.html           | 1 +
 files/templates/modals/award.html       | 1 +
 files/templates/modals/report_post.html | 1 +
 files/templates/util/macros.html        | 4 ++--
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 16d394ac9..e0bf21cfe 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -540,12 +540,19 @@ function insertGhostDivs(element) {
 
 const emojiModal = document.getElementById('emojiModal')
 
+function loadEmojis(t, inputTargetIDName)
 {
 	selecting = false;
 	speed_carot_modal.style.display = "none";
 
 	emojiInputTargetDOM = document.getElementById(inputTargetIDName);
 
+	if (t.dataset.previousModal) {
+		emojiModal.addEventListener('hide.bs.modal', () => {
+			bootstrap.Modal.getOrCreateInstance(document.getElementById(t.dataset.previousModal)).show()
+		}, {once : true});	
+	}
+
 	emojiModal.addEventListener('hide.bs.modal', () => {
 		setTimeout(() => {
 			emojiInputTargetDOM.focus();
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 349694eb9..a5a9adc3f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -794,6 +794,7 @@
 						<h6>We're sorry something here is wrong.</h6>
 						<small class="form-text text-muted mb-1">Please enter a reason for reporting below.</small>
 						<input autocomplete="off" maxlength="100" id="reason_comment" class="allow-emojis form-control">
+						{{macros.emoji_btn('reason_comment', 'reportCommentModal')}}
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
diff --git a/files/templates/modals/award.html b/files/templates/modals/award.html
index 01afa82ef..1ce099cbb 100644
--- a/files/templates/modals/award.html
+++ b/files/templates/modals/award.html
@@ -56,6 +56,7 @@
 				<div id="note_section">
 					<label id="notelabel" for="note" class="pt-4">Note (optional):</label>
 					<textarea autocomplete="off" id="note" maxlength="200" class="form-control" placeholder="Note to include in award notification..."></textarea>
+					{{macros.emoji_btn('note', 'awardModal')}}
 				</div>
 
 				<input autocomplete="off" id="giveaward" class="awardbtn btn btn-primary mt-3 fl-r" type="submit" data-nonce="{{g.nonce}}" data-onclick="giveaward(this)" value="Give Award" data-bs-dismiss="modal" disabled>
diff --git a/files/templates/modals/report_post.html b/files/templates/modals/report_post.html
index 80247e761..9ba8555a4 100644
--- a/files/templates/modals/report_post.html
+++ b/files/templates/modals/report_post.html
@@ -11,6 +11,7 @@
 				<h6>We're sorry something here is wrong.</h6>
 				<small class="form-text text-muted">Please enter a reason for reporting below.</small>
 				<input autocomplete="off" maxlength="100" id="reason_post" class="allow-emojis form-control b2 mt-1">
+				{{macros.emoji_btn('reason_post', 'reportPostModal')}}
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index a64f7d4a4..04cbdc17e 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -108,8 +108,8 @@
 
 
 
-{% macro emoji_btn(textarea_id) %}
-	<button type="button" class="btn btn-secondary format m-0 mr-1" data-nonce="{{g.nonce}}" data-onclick="loadEmojis('{{textarea_id}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji">
+{% macro emoji_btn(textarea_id, previous_modal) %}
+	<button type="button" class="btn btn-secondary format m-0 mr-1" data-nonce="{{g.nonce}}" data-onclick="loadEmojis(this, '{{textarea_id}}')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji" {% if previous_modal %}data-previous-modal="{{previous_modal}}"{% endif %}>
 		<i class="fas fa-smile-beam"></i>
 	</button>
 {% endmacro %}