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

Exit from loop if emoji found

main
Bob Mottram 2022-04-19 15:27:59 +01:00
parent a7cb0ead44
commit 82475bb07b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
webapp_utils.py
View File

@ -1680,7 +1680,7 @@ def html_common_emoji(base_dir: str, no_of_emoji: int) -> str:
emojis_filename = base_dir + '/emoji/emoji.json' emojis_filename = base_dir + '/emoji/emoji.json'
if not os.path.isfile(emojis_filename): if not os.path.isfile(emojis_filename):
emojis_filename = base_dir + '/emoji/default_emoji.json' emojis_filename = base_dir + '/emoji/default_emoji.json'
emojis_json = None emojis_json = load_json(emojis_filename)
common_emoji_filename = base_dir + '/accounts/common_emoji.txt' common_emoji_filename = base_dir + '/accounts/common_emoji.txt'
if not os.path.isfile(common_emoji_filename): if not os.path.isfile(common_emoji_filename):
@ -1701,17 +1701,20 @@ def html_common_emoji(base_dir: str, no_of_emoji: int) -> str:
emoji_name = common_emoji[line_ctr].split(' ')[1].replace('\n', '') emoji_name = common_emoji[line_ctr].split(' ')[1].replace('\n', '')
emoji_filename = base_dir + '/emoji/' + emoji_name + '.png' emoji_filename = base_dir + '/emoji/' + emoji_name + '.png'
if not os.path.isfile(emoji_filename): if not os.path.isfile(emoji_filename):
# load the emojis index emoji_filename = base_dir + '/customemoji/' + emoji_name + '.png'
if not emojis_json: if not os.path.isfile(emoji_filename):
emojis_json = load_json(emojis_filename) # load the emojis index
# lookup the name within the index to get the hex code if not emojis_json:
if emojis_json: emojis_json = load_json(emojis_filename)
for emoji_tag, emoji_code in emojis_json.items(): # lookup the name within the index to get the hex code
if emoji_tag == emoji_name: if emojis_json:
emoji_name = emoji_code for emoji_tag, emoji_code in emojis_json.items():
# get the filename based on the hex code if emoji_tag == emoji_name:
emoji_filename = \ emoji_name = emoji_code
base_dir + '/emoji/' + emoji_name + '.png' # get the filename based on the hex code
emoji_filename = \
base_dir + '/emoji/' + emoji_name + '.png'
break
if os.path.isfile(emoji_filename): if os.path.isfile(emoji_filename):
# NOTE: deliberately no alt text, so that without graphics only # NOTE: deliberately no alt text, so that without graphics only
# the emoji name shows # the emoji name shows