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

Store original post actor

main2
Bob Mottram 2019-10-31 09:59:06 +00:00
parent ebea9dd805
commit c3468fb84e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webinterface.py
View File

@ -1737,6 +1737,8 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if postHtml: if postHtml:
return postHtml.replace(';-999;',';'+str(pageNumber)+';').replace('?page=-999','?page='+str(pageNumber)) 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 # If this is the inbox timeline then don't show the repeat icon on any DMs
showRepeatIcon=showRepeats showRepeatIcon=showRepeats
showDMicon=False showDMicon=False
@ -1771,16 +1773,16 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
containerClass='container' containerClass='container'
containerClassIcons='containericons' containerClassIcons='containericons'
timeClass='time-right' timeClass='time-right'
actorNickname=getNicknameFromActor(postJsonObject['actor']) actorNickname=getNicknameFromActor(postActor)
if not actorNickname: if not actorNickname:
# single user instance # single user instance
actorNickname='dev' actorNickname='dev'
actorDomain,actorPort=getDomainFromActor(postJsonObject['actor']) actorDomain,actorPort=getDomainFromActor(postActor)
messageId='' messageId=''
if postJsonObject.get('id'): if postJsonObject.get('id'):
messageId=postJsonObject['id'].replace('/activity','') messageId=postJsonObject['id'].replace('/activity','')
displayName=getDisplayName(baseDir,postJsonObject['actor'],personCache) displayName=getDisplayName(baseDir,postActor,personCache)
if displayName: if displayName:
if ':' in displayName: if ':' in displayName:
displayName= \ displayName= \
@ -1812,7 +1814,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if showRepeatIcon: if showRepeatIcon:
if isAnnounced: if isAnnounced:
if postJsonObject['object'].get('attributedTo'): if postJsonObject['object'].get('attributedTo'):
if postJsonObject['object']['attributedTo'].startswith(postJsonObject['actor']): if postJsonObject['object']['attributedTo'].startswith(postActor):
titleStr+=' <img loading="lazy" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/>' titleStr+=' <img loading="lazy" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/>'
else: else:
announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo']) announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo'])
@ -1848,7 +1850,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
containerClassIcons='containericons darker' containerClassIcons='containericons darker'
containerClass='container darker' containerClass='container darker'
#avatarPosition=' class="right"' #avatarPosition=' class="right"'
if postJsonObject['object']['inReplyTo'].startswith(postJsonObject['actor']): if postJsonObject['object']['inReplyTo'].startswith(postActor):
titleStr+=' <img loading="lazy" src="/'+iconsDir+'/reply.png" class="announceOrReply"/>' titleStr+=' <img loading="lazy" src="/'+iconsDir+'/reply.png" class="announceOrReply"/>'
else: else:
if '/statuses/' in postJsonObject['object']['inReplyTo']: if '/statuses/' in postJsonObject['object']['inReplyTo']:
@ -1968,13 +1970,13 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
attachmentStr+='</div>' attachmentStr+='</div>'
if not avatarUrl: if not avatarUrl:
avatarUrl=getPersonAvatarUrl(baseDir,postJsonObject['actor'],personCache) avatarUrl=getPersonAvatarUrl(baseDir,postActor,personCache)
avatarUrl=updateAvatarImageCache(session,baseDir,httpPrefix,postJsonObject['actor'],avatarUrl,personCache) avatarUrl=updateAvatarImageCache(session,baseDir,httpPrefix,postActor,avatarUrl,personCache)
else: else:
updateAvatarImageCache(session,baseDir,httpPrefix,postJsonObject['actor'],avatarUrl,personCache) updateAvatarImageCache(session,baseDir,httpPrefix,postActor,avatarUrl,personCache)
if not avatarUrl: if not avatarUrl:
avatarUrl=postJsonObject['actor']+'/avatar.png' avatarUrl=postActor+'/avatar.png'
fullDomain=domain fullDomain=domain
if port: if port:
@ -1982,7 +1984,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if ':' not in domain: if ':' not in domain:
fullDomain=domain+':'+str(port) fullDomain=domain+':'+str(port)
if fullDomain not in postJsonObject['actor']: if fullDomain not in postActor:
inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName = \ inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName = \
getPersonBox(baseDir,session,wfRequest,personCache, \ getPersonBox(baseDir,session,wfRequest,personCache, \
projectVersion,httpPrefix,nickname,domain,'outbox') projectVersion,httpPrefix,nickname,domain,'outbox')
@ -1998,14 +2000,14 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
avatarImageInPost= \ avatarImageInPost= \
' <div class="timeline-avatar">' \ ' <div class="timeline-avatar">' \
' <a href="'+postJsonObject['actor']+'">' \ ' <a href="'+postActor+'">' \
' <img loading="lazy" src="'+avatarUrl+'" title="'+translate['Show profile']+'" alt="Avatar"'+avatarPosition+'/></a>' \ ' <img loading="lazy" src="'+avatarUrl+'" title="'+translate['Show profile']+'" alt="Avatar"'+avatarPosition+'/></a>' \
' </div>' ' </div>'
if showAvatarOptions and fullDomain+'/users/'+nickname not in postJsonObject['actor']: if showAvatarOptions and fullDomain+'/users/'+nickname not in postActor:
avatarImageInPost= \ avatarImageInPost= \
' <div class="timeline-avatar">' \ ' <div class="timeline-avatar">' \
' <a href="/users/'+nickname+'?options='+postJsonObject['actor']+';'+str(pageNumber)+';'+avatarUrl+messageIdStr+'">' \ ' <a href="/users/'+nickname+'?options='+postActor+';'+str(pageNumber)+';'+avatarUrl+messageIdStr+'">' \
' <img loading="lazy" title="'+translate['Show options for this person']+'" src="'+avatarUrl+'" '+avatarPosition+'/></a>' \ ' <img loading="lazy" title="'+translate['Show options for this person']+'" src="'+avatarUrl+'" '+avatarPosition+'/></a>' \
' </div>' ' </div>'
@ -2055,8 +2057,8 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
deleteStr='' deleteStr=''
if allowDeletion or \ if allowDeletion or \
('/'+fullDomain+'/' in postJsonObject['actor'] and \ ('/'+fullDomain+'/' in postActor and \
postJsonObject['object']['id'].startswith(postJsonObject['actor'])): postJsonObject['object']['id'].startswith(postActor)):
if '/users/'+nickname+'/' in postJsonObject['object']['id']: if '/users/'+nickname+'/' in postJsonObject['object']['id']:
deleteStr= \ deleteStr= \
'<a href="/users/'+nickname+'?delete='+postJsonObject['object']['id']+pageNumberParam+'" title="'+translate['Delete this post']+'">' \ '<a href="/users/'+nickname+'?delete='+postJsonObject['object']['id']+pageNumberParam+'" title="'+translate['Delete this post']+'">' \