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

Obtain preferred name from cached actor

main2
Bob Mottram 2019-10-09 14:24:14 +01:00
parent 1dbf4ed7c9
commit 4ac811e584
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils.py
View File

@ -69,7 +69,7 @@ def urlPermitted(url: str, federationList: [],capability: str):
return True return True
return False return False
def getDisplayName(actor: str,personCache: {}) -> str: def getDisplayName(baseDir: str,actor: str,personCache: {}) -> str:
"""Returns the display name for the given actor """Returns the display name for the given actor
""" """
if '/statuses/' in actor: if '/statuses/' in actor:
@ -79,6 +79,19 @@ def getDisplayName(actor: str,personCache: {}) -> str:
if personCache[actor].get('actor'): if personCache[actor].get('actor'):
if personCache[actor]['actor'].get('name'): if personCache[actor]['actor'].get('name'):
return personCache[actor]['actor']['name'] return personCache[actor]['actor']['name']
else:
# Try to obtain from the cached actors
cachedActorFilename=baseDir+'/cache/actors/'+actor.replace('/','#')+'.json'
if os.path.isfile(cachedActorFilename):
actorJson=None
try:
with open(cachedActorFilename, 'r') as fp:
actorJson=commentjson.load(fp)
except Exception as e:
print(e)
if actorJson:
if actorJson.get('name'):
return(actorJson['name'])
return None return None
def getNicknameFromActor(actor: str) -> str: def getNicknameFromActor(actor: str) -> str:

12
webinterface.py
View File

@ -1702,7 +1702,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if postJsonObject.get('id'): if postJsonObject.get('id'):
messageId=postJsonObject['id'].replace('/activity','') messageId=postJsonObject['id'].replace('/activity','')
displayName=getDisplayName(postJsonObject['actor'],personCache) displayName=getDisplayName(baseDir,postJsonObject['actor'],personCache)
if displayName: if displayName:
displayName= \ displayName= \
addEmojiToDisplayName(baseDir,httpPrefix, \ addEmojiToDisplayName(baseDir,httpPrefix, \
@ -1730,7 +1730,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo']) announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo'])
if announceNickname: if announceNickname:
announceDomain,announcePort=getDomainFromActor(postJsonObject['object']['attributedTo']) announceDomain,announcePort=getDomainFromActor(postJsonObject['object']['attributedTo'])
announceDisplayName=getDisplayName(postJsonObject['object']['attributedTo'],personCache) announceDisplayName=getDisplayName(baseDir,postJsonObject['object']['attributedTo'],personCache)
if announceDisplayName: if announceDisplayName:
announceDisplayName= \ announceDisplayName= \
addEmojiToDisplayName(baseDir,httpPrefix, \ addEmojiToDisplayName(baseDir,httpPrefix, \
@ -1762,11 +1762,12 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
titleStr+=' <img src="/'+iconsDir+'/reply.png" class="announceOrReply"/>' titleStr+=' <img src="/'+iconsDir+'/reply.png" class="announceOrReply"/>'
else: else:
if '/statuses/' in postJsonObject['object']['inReplyTo']: if '/statuses/' in postJsonObject['object']['inReplyTo']:
replyNickname=getNicknameFromActor(postJsonObject['object']['inReplyTo']) replyActor=replyActor.split('/statuses/')[0]
replyNickname=getNicknameFromActor(replyActor)
if replyNickname: if replyNickname:
replyDomain,replyPort=getDomainFromActor(postJsonObject['object']['inReplyTo']) replyDomain,replyPort=getDomainFromActor(replyActor)
if replyNickname and replyDomain: if replyNickname and replyDomain:
replyDisplayName=getDisplayName(postJsonObject['object']['inReplyTo'],personCache) replyDisplayName=getDisplayName(baseDir,replyActor,personCache)
if replyDisplayName: if replyDisplayName:
replyDisplayName= \ replyDisplayName= \
addEmojiToDisplayName(baseDir,httpPrefix, \ addEmojiToDisplayName(baseDir,httpPrefix, \
@ -1775,7 +1776,6 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
titleStr+=' <img src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+replyDisplayName+'</a>' titleStr+=' <img src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+replyDisplayName+'</a>'
# show avatar of person replied to # show avatar of person replied to
replyActor=postJsonObject['object']['inReplyTo'].split('/statuses/')[0]
replyAvatarUrl=getPersonAvatarUrl(baseDir,replyActor,personCache) replyAvatarUrl=getPersonAvatarUrl(baseDir,replyActor,personCache)
if replyAvatarUrl: if replyAvatarUrl:
replyAvatarImageInPost= \ replyAvatarImageInPost= \