diff --git a/webinterface.py b/webinterface.py
index e76139670..d740d76c9 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1737,6 +1737,8 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if postHtml:
return postHtml.replace(';-999;',';'+str(pageNumber)+';').replace('?page=-999','?page='+str(pageNumber))
+ postActor=postJsonObject['actor']
+
# If this is the inbox timeline then don't show the repeat icon on any DMs
showRepeatIcon=showRepeats
showDMicon=False
@@ -1771,16 +1773,16 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
containerClass='container'
containerClassIcons='containericons'
timeClass='time-right'
- actorNickname=getNicknameFromActor(postJsonObject['actor'])
+ actorNickname=getNicknameFromActor(postActor)
if not actorNickname:
# single user instance
actorNickname='dev'
- actorDomain,actorPort=getDomainFromActor(postJsonObject['actor'])
+ actorDomain,actorPort=getDomainFromActor(postActor)
messageId=''
if postJsonObject.get('id'):
messageId=postJsonObject['id'].replace('/activity','')
- displayName=getDisplayName(baseDir,postJsonObject['actor'],personCache)
+ displayName=getDisplayName(baseDir,postActor,personCache)
if displayName:
if ':' in displayName:
displayName= \
@@ -1812,7 +1814,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if showRepeatIcon:
if isAnnounced:
if postJsonObject['object'].get('attributedTo'):
- if postJsonObject['object']['attributedTo'].startswith(postJsonObject['actor']):
+ if postJsonObject['object']['attributedTo'].startswith(postActor):
titleStr+=' '
else:
announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo'])
@@ -1848,7 +1850,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
containerClassIcons='containericons darker'
containerClass='container darker'
#avatarPosition=' class="right"'
- if postJsonObject['object']['inReplyTo'].startswith(postJsonObject['actor']):
+ if postJsonObject['object']['inReplyTo'].startswith(postActor):
titleStr+='
'
else:
if '/statuses/' in postJsonObject['object']['inReplyTo']:
@@ -1968,13 +1970,13 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
attachmentStr+=''
if not avatarUrl:
- avatarUrl=getPersonAvatarUrl(baseDir,postJsonObject['actor'],personCache)
- avatarUrl=updateAvatarImageCache(session,baseDir,httpPrefix,postJsonObject['actor'],avatarUrl,personCache)
+ avatarUrl=getPersonAvatarUrl(baseDir,postActor,personCache)
+ avatarUrl=updateAvatarImageCache(session,baseDir,httpPrefix,postActor,avatarUrl,personCache)
else:
- updateAvatarImageCache(session,baseDir,httpPrefix,postJsonObject['actor'],avatarUrl,personCache)
+ updateAvatarImageCache(session,baseDir,httpPrefix,postActor,avatarUrl,personCache)
if not avatarUrl:
- avatarUrl=postJsonObject['actor']+'/avatar.png'
+ avatarUrl=postActor+'/avatar.png'
fullDomain=domain
if port:
@@ -1982,7 +1984,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if ':' not in domain:
fullDomain=domain+':'+str(port)
- if fullDomain not in postJsonObject['actor']:
+ if fullDomain not in postActor:
inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName = \
getPersonBox(baseDir,session,wfRequest,personCache, \
projectVersion,httpPrefix,nickname,domain,'outbox')
@@ -1998,14 +2000,14 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
avatarImageInPost= \
'