From b5720aad2654444d601440a75b43834d04123428 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Fri, 27 Oct 2023 11:09:07 +0300
Subject: [PATCH] make inline emoji popup much faster

---
 files/assets/js/emoji_modal.js   | 43 ++++++++++++++++++++++----------
 files/templates/util/macros.html |  2 +-
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 38689d6ca9..75260954f2 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -152,24 +152,17 @@ const emojisSearchDictionary = {
 	}
 };
 
-// get public emojis list
-function fetchEmojis() {
+function makeEmojisSearchDictionary() {
+	// get public emojis list
 	const headers = new Headers({xhr: "xhr"})
 	return fetch("/emojis.json", {
 		headers,
 	})
 		.then(res => res.json())
 		.then(emojis => {
-			if (! (emojis instanceof Array ))
-				throw new TypeError("[EMOJI DIALOG] rDrama's server should have sent a JSON-coded Array!");
-
 			globalEmojis = emojis.map(({name, author_username, count}) => ({name, author_username, count}));
 
-			let classes = ["Marsey", "Platy", "Wolf", "Donkey Kong", "Tay", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc"]
-
-			const bussyDOM = document.createElement("div");
-
-			for(let i = 0; i < emojis.length; i++)
+			for (let i = 0; i < emojis.length; i++)
 			{
 				const emoji = emojis[i];
 
@@ -186,6 +179,29 @@ function fetchEmojis() {
 				if (emoji.tags instanceof Array)
 					for(let i = 0; i < emoji.tags.length; i++)
 						emojisSearchDictionary.updateTag(emoji.tags[i], emoji.name);
+			}
+		})
+}
+
+
+// get public emojis list
+function fetchEmojis() {
+	const headers = new Headers({xhr: "xhr"})
+	return fetch("/emojis.json", {
+		headers,
+	})
+		.then(res => res.json())
+		.then(emojis => {
+			if (!(emojis instanceof Array ))
+				throw new TypeError("[EMOJI DIALOG] rDrama's server should have sent a JSON-coded Array!");
+
+			let classes = ["Marsey", "Platy", "Wolf", "Donkey Kong", "Tay", "Capy", "Carp", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc"]
+
+			const bussyDOM = document.createElement("div");
+
+			for(let i = 0; i < emojis.length; i++)
+			{
+				const emoji = emojis[i];
 
 				// Create emoji DOM
 				const emojiDOM = document.importNode(emojiButtonTemplateDOM.content, true).children[0];
@@ -470,9 +486,9 @@ function update_speed_emoji_modal(event)
 
 	/* We could also check emoji_typing_state here, which is less accurate but more efficient. I've
 		* kept it unless someone wants to provide an option to toggle it for performance */
-	if (curr_word_is_emoji() && current_word != ":")
+	if (current_word && curr_word_is_emoji() && current_word != ":")
 	{
-		loadEmojis(null, null).then( () => {
+		makeEmojisSearchDictionary().then( () => {
 			let modal_pos = event.target.getBoundingClientRect();
 			modal_pos.x += window.scrollX;
 			modal_pos.y += window.scrollY;
@@ -541,7 +557,7 @@ function insertGhostDivs(element) {
 
 const emojiModal = document.getElementById('emojiModal')
 
-function loadEmojis(t, inputTargetIDName)
+function openEmojiModal(t, inputTargetIDName)
 {
 	selecting = false;
 	speed_carot_modal.style.display = "none";
@@ -564,6 +580,7 @@ function loadEmojis(t, inputTargetIDName)
 	switch (emojiEngineState) {
 		case "inactive":
 			emojiEngineState = "loading"
+			makeEmojisSearchDictionary();
 			return fetchEmojis();
 		case "loading":
 			// this works because once the fetch completes, the first keystroke callback will fire and use the current value
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 3e1f6711f0..f555cea285 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -114,7 +114,7 @@
 
 
 {% 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 %}>
+	<button type="button" class="btn btn-secondary format m-0 mr-1" data-nonce="{{g.nonce}}" data-onclick="openEmojiModal(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 %}