diff --git a/webinterface.py b/webinterface.py index d023e499e..b20c72467 100644 --- a/webinterface.py +++ b/webinterface.py @@ -2172,7 +2172,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ replyStr='' if showIcons: - replyToLink=postJsonObject['object']['id'] + replyToLink=messageId if postJsonObject['object'].get('attributedTo'): replyToLink+='?mention='+postJsonObject['object']['attributedTo'] if postJsonObject['object'].get('content'): @@ -2215,7 +2215,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ announceLink='unrepeat' announceTitle=translate['Undo the repeat'] announceStr= \ - '' @@ -2233,7 +2233,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ likeTitle=translate['Undo the like'] likeStr= \ '' @@ -2250,7 +2250,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ bookmarkTitle=translate['Undo the bookmark'] bookmarkStr= \ '' @@ -2262,16 +2262,16 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ muteStr='' if allowDeletion or \ ('/'+fullDomain+'/' in postActor and \ - postJsonObject['object']['id'].startswith(postActor)): - if '/users/'+nickname+'/' in postJsonObject['object']['id']: - deleteStr='' + messageId.startswith(postActor)): + if '/users/'+nickname+'/' in messageId: + deleteStr='' deleteStr+=''+translate['Delete this post']+' |' else: if not isMuted: - muteStr='' + muteStr='' muteStr+=''+translate['Mute this post']+' |' else: - muteStr='' + muteStr='' muteStr+=''+translate['Undo mute']+' |' replyAvatarImageInPost='' @@ -2292,7 +2292,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ addEmojiToDisplayName(baseDir,httpPrefix, \ nickname,domain, \ announceDisplayName,False) - titleStr+=' '+translate['announces']+' '+announceDisplayName+'' + titleStr+=' '+translate['announces']+' '+announceDisplayName+'' # show avatar of person replied to announceActor=postJsonObject['object']['attributedTo'] announceAvatarUrl=getPersonAvatarUrl(baseDir,announceActor,personCache) @@ -2304,11 +2304,11 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ 'title="'+translate['Show options for this person']+ \ '" alt=" "'+avatarPosition+'/>' else: - titleStr+=' '+translate['announces']+' @'+announceNickname+'@'+announceDomain+'' + titleStr+=' '+translate['announces']+' @'+announceNickname+'@'+announceDomain+'' else: - titleStr+=' '+translate['announces']+' @unattributed' + titleStr+=' '+translate['announces']+' @unattributed' else: - titleStr+=' '+translate['announces']+' @unattributed' + titleStr+=' '+translate['announces']+' @unattributed' else: if postJsonObject['object'].get('inReplyTo'): containerClassIcons='containericons darker' @@ -2380,7 +2380,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ if postJsonObject['object'].get('url'): imagePostUrl=postJsonObject['object']['url'] else: - imagePostUrl=postJsonObject['object']['id'] + imagePostUrl=messageId if imageDescription: galleryStr+='
'+imageDescription+'
\n' else: @@ -2418,7 +2418,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ if postJsonObject['object'].get('url'): videoPostUrl=postJsonObject['object']['url'] else: - videoPostUrl=postJsonObject['object']['id'] + videoPostUrl=messageId if imageDescription: galleryStr+='
'+imageDescription+'
\n' else: @@ -2455,7 +2455,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ if postJsonObject['object'].get('url'): audioPostUrl=postJsonObject['object']['url'] else: - audioPostUrl=postJsonObject['object']['id'] + audioPostUrl=messageId if imageDescription: galleryStr+='
'+imageDescription+'
\n' else: