Searching for custom emoji

2021-11-01 23:11:41 +00:00 · 2021-11-01 23:11:41 +00:00 · 99d574e55a
parent 259f4eadda
commit 99d574e55a
1 changed files with 6 additions and 0 deletions
--- a/webapp_search.py
+++ b/webapp_search.py
@ -59,6 +59,7 @@ def htmlSearchEmoji(cssCache: {}, translate: {},
        cssFilename = baseDir + '/epicyon.css'

    emojiLookupFilename = baseDir + '/emoji/emoji.json'
+    customEmojiLookupFilename = baseDir + '/emojicustom/emoji.json'

    # create header
    instanceTitle = \
@ -77,6 +78,11 @@ def htmlSearchEmoji(cssCache: {}, translate: {},

    emojiJson = loadJson(emojiLookupFilename)
    if emojiJson:
+        customEmojiJson = None
+        if os.path.isfile(customEmojiLookupFilename):
+            customEmojiJson = loadJson(customEmojiLookupFilename)
+        if customEmojiJson:
+            emojiJson = dict(emojiJson, **customEmojiJson)
        results = {}
        for emojiName, filename in emojiJson.items():
            if searchStr in emojiName: