mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace emoji tags

main2
Bob Mottram 2019-09-23 12:34:24 +01:00
parent a8689b749c
commit 218693f7b1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content.py
View File

@ -111,7 +111,7 @@ def loadEmojiDict(emojiDataFilename: str,emojiDict: {}) -> None:
emojiName=emojiName.split('..')[0]
emojiDict[emojiName.lower()]=emojiUnicode
def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji: {},postTags: {},emojiDict: {}) -> bool:
def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji: {},postTags: {},emojiDict: {},inMessageContent: bool) -> bool:
"""Detects Emoji and adds them to the replacements dict
Also updates the tags list to be added to the post
"""
@ -144,7 +144,9 @@ def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji:
'name': ':'+emoji+':',
'type': 'Emoji'
}
replaceEmoji[wordStr]='<img src="'+emojiUrl+'" title="'+emoji+'" alt="'+emoji+'"/>'
if not inMessageContent:
# when altering emoji in display name
replaceEmoji[wordStr]='<img src="'+emojiUrl+'" title="'+emoji+'" alt="'+emoji+'"/>'
return True
def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},recipients: [],tags: {}) -> bool:

8
webinterface.py
View File

@ -1745,10 +1745,12 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if displayName:
if ':' in displayName:
displayName=displayName.replace('<p>','').replace('</p>','')
emojiTags={}
displayName= \
addHtmlTags(baseDir,httpPrefix, \
nickname,domain,displayName,[],{})
nickname,domain,displayName,[],emojiTags)
displayName=displayName.replace('<p>','').replace('</p>','')
displayName=htmlRemplaceEmojiFromTags(displayName,emojiTags)
titleStr+='<a href="'+messageId+'">'+displayName+'</a>'
else:
titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>'
@ -1873,10 +1875,12 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if displayName:
if ':' in displayName:
displayName=displayName.replace('<p>','').replace('</p>','')
emojiTags={}
displayName= \
addHtmlTags(baseDir,httpPrefix, \
nickname,domain,displayName,[],{})
nickname,domain,displayName,[],emojiTags)
displayName=displayName.replace('<p>','').replace('</p>','')
displayName=htmlRemplaceEmojiFromTags(displayName,emojiTags)
titleStr=displayName+' '+titleStr
avatarImageInPost= \