From 6a1409e09b6a5324f3d801c971f5fd8cefb11eab Mon Sep 17 00:00:00 2001
From: sn0w <me@sn0w.cx>
Date: Sun, 3 Sep 2023 16:05:56 +0200
Subject: [PATCH] Do not copy all emojis in recentEmoji getter

---
 src/modules/recentEmojis.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/recentEmojis.js b/src/modules/recentEmojis.js
index baab1c52..81936b98 100644
--- a/src/modules/recentEmojis.js
+++ b/src/modules/recentEmojis.js
@@ -37,11 +37,18 @@ const recentEmojis = {
 
   getters: {
     recentEmojis: (state, getters, rootState) => state.emojis.reduce((objects, displayText) => {
-      const allEmojis = rootState.instance.emoji.concat(rootState.instance.customEmoji)
-      let emojiObject = allEmojis.find(emoji => emoji.displayText === displayText)
+      let comparator = emoji => emoji.displayText === displayText
+
+      let emojiObject = rootState.instance.emoji.find(comparator)
       if (emojiObject !== undefined) {
         objects.push(emojiObject)
+      } else {
+        emojiObject = rootState.instance.customEmoji.find(comparator)
+        if (emojiObject !== undefined) {
+          objects.push(emojiObject)
+        }
       }
+
       return objects
     }, []),
   },