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

No second colon

main2
Bob Mottram 2019-10-09 19:32:53 +01:00
parent ffd290b681
commit 9ad5b34002
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
content.py
View File

@ -311,29 +311,25 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
if ':' in wordStr: if ':' in wordStr:
print('TAG: emoji located - '+wordStr) print('TAG: emoji located - '+wordStr)
wordStr2=wordStr.split(':')[1] wordStr2=wordStr.split(':')[1]
print('TAG: wordStr2a - '+wordStr2) if not emojiDict:
if ':' in wordStr2: print('Loading emoji lookup')
wordStr2=wordStr2.split(':')[0] if not os.path.isfile(baseDir+'/emoji/emoji.json'):
print('TAG: wordStr2b - '+wordStr2) copyfile(baseDir+'/emoji/default_emoji.json',baseDir+'/emoji/emoji.json')
if not emojiDict: emojiDictCtr=0
print('Loading emoji lookup') while not emojiDict and emojiDictCtr<4:
if not os.path.isfile(baseDir+'/emoji/emoji.json'): if emojiDictCtr>0:
copyfile(baseDir+'/emoji/default_emoji.json',baseDir+'/emoji/emoji.json') print('Retry emoji load '+baseDir+'/emoji/emoji.json')
emojiDictCtr=0 try:
while not emojiDict and emojiDictCtr<4: with open(baseDir+'/emoji/emoji.json', 'r') as fp:
if emojiDictCtr>0: emojiDict=commentjson.load(fp)
print('Retry emoji load '+baseDir+'/emoji/emoji.json') break
try: except Exception as e:
with open(baseDir+'/emoji/emoji.json', 'r') as fp: print('Failed to load emoji: '+baseDir+'/emoji/emoji.json '+str(e))
emojiDict=commentjson.load(fp) time.sleep(1)
break
except Exception as e:
print('Failed to load emoji: '+baseDir+'/emoji/emoji.json '+str(e))
time.sleep(1)
emojiDictCtr+=1 emojiDictCtr+=1
print('TAG: looking up emoji for :'+wordStr2+':') print('TAG: looking up emoji for :'+wordStr2+':')
addEmoji(baseDir,':'+wordStr2+':',httpPrefix,originalDomain,replaceEmoji,hashtags,emojiDict) addEmoji(baseDir,':'+wordStr2+':',httpPrefix,originalDomain,replaceEmoji,hashtags,emojiDict)
# replace words with their html versions # replace words with their html versions
for wordStr,replaceStr in replaceMentions.items(): for wordStr,replaceStr in replaceMentions.items():

5
webinterface.py
View File

@ -1637,10 +1637,7 @@ def addEmojiToDisplayName(baseDir: str,httpPrefix: str, \
# remove any stray emoji # remove any stray emoji
while ':' in displayName: while ':' in displayName:
nameStr=displayName.split(':')[1] emojiStr=displayName.split(':')[1]
if ':' not in nameStr:
break
emojiStr=nameStr.split(':')[0]
displayName=displayName.replace(':'+emojiStr+':','').strip() displayName=displayName.replace(':'+emojiStr+':','').strip()
print('TAG: displayName after tags 3: '+displayName) print('TAG: displayName after tags 3: '+displayName)
print('TAG: displayName after tag replacements: '+displayName) print('TAG: displayName after tag replacements: '+displayName)