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

Creating emoji dict

merge-requests/30/head
Bob Mottram 2021-11-01 23:34:11 +00:00
parent 63865bad6b
commit 9bafdef7bf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content.py
View File

@ -905,8 +905,8 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
customEmojiDict = \ customEmojiDict = \
loadJson(baseDir + '/emojicustom/emoji.json') loadJson(baseDir + '/emojicustom/emoji.json')
if customEmojiDict: if customEmojiDict:
emojiDict = \ newEmojiDict = dict(emojiDict, **customEmojiDict)
dict(emojiDict, **customEmojiDict) emojiDict = newEmojiDict
# print('TAG: looking up emoji for :' + wordStr2 + ':') # print('TAG: looking up emoji for :' + wordStr2 + ':')
_addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix, _addEmoji(baseDir, ':' + wordStr2 + ':', httpPrefix,

3
webapp_search.py
View File

@ -80,7 +80,8 @@ def htmlSearchEmoji(cssCache: {}, translate: {},
if emojiJson: if emojiJson:
if os.path.isfile(customEmojiLookupFilename): if os.path.isfile(customEmojiLookupFilename):
customEmojiJson = loadJson(customEmojiLookupFilename) customEmojiJson = loadJson(customEmojiLookupFilename)
emojiJson = dict(emojiJson, **customEmojiJson) newEmojiJson = dict(emojiJson, **customEmojiJson)
emojiDict = newEmojiJson
results = {} results = {}
for emojiName, filename in emojiJson.items(): for emojiName, filename in emojiJson.items():
if searchStr in emojiName: if searchStr in emojiName: