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

Tidying

main2
Bob Mottram 2019-09-23 12:44:43 +01:00
parent 1a5ed483bb
commit 372edabd3d
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
webinterface.py
View File

@ -1609,6 +1609,21 @@ def rejectAnnounce(announceFilename: str):
rejectAnnounceFile.write('\n')
rejectAnnounceFile.close()
def addEmojiToDisplayName(baseDir: str,httpPrefix: str, \
nickname: str,domain: str, \
displayName: str) -> str:
"""Adds emoji icons to display names on individual posts
"""
if ':' in displayName:
displayName=displayName.replace('<p>','').replace('</p>','')
emojiTags=[]
displayName= \
addHtmlTags(baseDir,httpPrefix, \
nickname,domain,displayName,emojiTags,{})
displayName=displayName.replace('<p>','').replace('</p>','')
displayName=htmlReplaceEmojiFromTags(displayName,emojiTags)
return displayName
def individualPostAsHtml(iconsDir: str,translate: {}, \
pageNumber: int,baseDir: str, \
session,wfRequest: {},personCache: {}, \
@ -1743,14 +1758,10 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
displayName=getDisplayName(postJsonObject['actor'],personCache)
if displayName:
if ':' in displayName:
displayName=displayName.replace('<p>','').replace('</p>','')
emojiTags=[]
displayName= \
addHtmlTags(baseDir,httpPrefix, \
nickname,domain,displayName,emojiTags,{})
displayName=displayName.replace('<p>','').replace('</p>','')
displayName=htmlReplaceEmojiFromTags(displayName,emojiTags)
addEmojiToDisplayName(baseDir,httpPrefix, \
nickname,domain, \
displayName)
titleStr+='<a href="'+messageId+'">'+displayName+'</a>'
else:
titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>'
@ -1873,14 +1884,10 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if avatarUrl2:
avatarUrl=avatarUrl2
if displayName:
if ':' in displayName:
displayName=displayName.replace('<p>','').replace('</p>','')
emojiTags=[]
displayName= \
addHtmlTags(baseDir,httpPrefix, \
nickname,domain,displayName,emojiTags,{})
displayName=displayName.replace('<p>','').replace('</p>','')
displayName=htmlReplaceEmojiFromTags(displayName,emojiTags)
addEmojiToDisplayName(baseDir,httpPrefix, \
nickname,domain, \
displayName)
titleStr=displayName+' '+titleStr
avatarImageInPost= \