indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Searching for custom emoji

merge-requests/30/head
Bob Mottram 2021-11-01 23:11:41 +00:00
parent 259f4eadda
commit 99d574e55a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp_search.py
View File

@ -59,6 +59,7 @@ def htmlSearchEmoji(cssCache: {}, translate: {},
cssFilename = baseDir + '/epicyon.css' cssFilename = baseDir + '/epicyon.css'
emojiLookupFilename = baseDir + '/emoji/emoji.json' emojiLookupFilename = baseDir + '/emoji/emoji.json'
customEmojiLookupFilename = baseDir + '/emojicustom/emoji.json'
# create header # create header
instanceTitle = \ instanceTitle = \
@ -77,6 +78,11 @@ def htmlSearchEmoji(cssCache: {}, translate: {},
emojiJson = loadJson(emojiLookupFilename) emojiJson = loadJson(emojiLookupFilename)
if emojiJson: if emojiJson:
customEmojiJson = None
if os.path.isfile(customEmojiLookupFilename):
customEmojiJson = loadJson(customEmojiLookupFilename)
if customEmojiJson:
emojiJson = dict(emojiJson, **customEmojiJson)
results = {} results = {}
for emojiName, filename in emojiJson.items(): for emojiName, filename in emojiJson.items():
if searchStr in emojiName: if searchStr in emojiName: