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

Don't link to person options for the news account

main
Bob Mottram 2020-10-13 10:27:05 +01:00
parent 4f76103e92
commit 4e183894f8
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webinterface.py
View File

@ -4433,6 +4433,7 @@ def individualPostAsHtml(allowDownloads: bool,
if showAvatarOptions and \ if showAvatarOptions and \
fullDomain + '/users/' + nickname not in postActor: fullDomain + '/users/' + nickname not in postActor:
if '/users/news/' not in avatarUrl:
avatarLink = \ avatarLink = \
' <a class="imageAnchor" href="/users/' + \ ' <a class="imageAnchor" href="/users/' + \
nickname + '?options=' + postActor + \ nickname + '?options=' + postActor + \
@ -4441,6 +4442,12 @@ def individualPostAsHtml(allowDownloads: bool,
' <img loading="lazy" title="' + \ ' <img loading="lazy" title="' + \
translate['Show options for this person'] + \ translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + '/></a>\n' '" src="' + avatarUrl + '" ' + avatarPosition + '/></a>\n'
else:
# don't link to the person options for the news account
avatarLink += \
' <img loading="lazy" title="' + \
translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + '/>\n'
avatarImageInPost = \ avatarImageInPost = \
' <div class="timeline-avatar">' + avatarLink.strip() + '</div>\n' ' <div class="timeline-avatar">' + avatarLink.strip() + '</div>\n'
@ -4929,13 +4936,17 @@ def individualPostAsHtml(allowDownloads: bool,
if announceAvatarUrl: if announceAvatarUrl:
idx = 'Show options for this person' idx = 'Show options for this person'
if '/users/news/' not in announceAvatarUrl:
replyAvatarImageInPost = \ replyAvatarImageInPost = \
' ' \ ' ' \
'<div class="timeline-avatar-reply">\n' \ '<div class=' + \
'"timeline-avatar-reply">\n' \
' ' + \
'<a class="imageAnchor" ' + \ '<a class="imageAnchor" ' + \
'href="/users/' + nickname + \ 'href="/users/' + nickname + \
'?options=' + \ '?options=' + \
announceActor + ';' + str(pageNumber) + \ announceActor + ';' + \
str(pageNumber) + \
';' + announceAvatarUrl + \ ';' + announceAvatarUrl + \
messageIdStr + '">' \ messageIdStr + '">' \
'<img loading="lazy" src="' + \ '<img loading="lazy" src="' + \