From 4e183894f8f66c73adb738df25ce3b4b4f970d05 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 13 Oct 2020 10:27:05 +0100
Subject: [PATCH] Don't link to person options for the news account

---
 webinterface.py | 55 +++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/webinterface.py b/webinterface.py
index 84931362..bffba3dd 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -4433,14 +4433,21 @@ def individualPostAsHtml(allowDownloads: bool,
 
     if showAvatarOptions and \
        fullDomain + '/users/' + nickname not in postActor:
-        avatarLink = \
-            '        <a class="imageAnchor" href="/users/' + \
-            nickname + '?options=' + postActor + \
-            ';' + str(pageNumber) + ';' + avatarUrl + messageIdStr + '">\n'
-        avatarLink += \
-            '        <img loading="lazy" title="' + \
-            translate['Show options for this person'] + \
-            '" src="' + avatarUrl + '" ' + avatarPosition + '/></a>\n'
+        if '/users/news/' not in avatarUrl:
+            avatarLink = \
+                '        <a class="imageAnchor" href="/users/' + \
+                nickname + '?options=' + postActor + \
+                ';' + str(pageNumber) + ';' + avatarUrl + messageIdStr + '">\n'
+            avatarLink += \
+                '        <img loading="lazy" title="' + \
+                translate['Show options for this person'] + \
+                '" 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 = \
         '      <div class="timeline-avatar">' + avatarLink.strip() + '</div>\n'
 
@@ -4929,20 +4936,24 @@ def individualPostAsHtml(allowDownloads: bool,
 
                             if announceAvatarUrl:
                                 idx = 'Show options for this person'
-                                replyAvatarImageInPost = \
-                                    '        ' \
-                                    '<div class="timeline-avatar-reply">\n' \
-                                    '            <a class="imageAnchor" ' + \
-                                    'href="/users/' + nickname + \
-                                    '?options=' + \
-                                    announceActor + ';' + str(pageNumber) + \
-                                    ';' + announceAvatarUrl + \
-                                    messageIdStr + '">' \
-                                    '<img loading="lazy" src="' + \
-                                    announceAvatarUrl + '" ' \
-                                    'title="' + translate[idx] + \
-                                    '" alt=" "' + avatarPosition + \
-                                    '/></a>\n    </div>\n'
+                                if '/users/news/' not in announceAvatarUrl:
+                                    replyAvatarImageInPost = \
+                                        '        ' \
+                                        '<div class=' + \
+                                        '"timeline-avatar-reply">\n' \
+                                        '            ' + \
+                                        '<a class="imageAnchor" ' + \
+                                        'href="/users/' + nickname + \
+                                        '?options=' + \
+                                        announceActor + ';' + \
+                                        str(pageNumber) + \
+                                        ';' + announceAvatarUrl + \
+                                        messageIdStr + '">' \
+                                        '<img loading="lazy" src="' + \
+                                        announceAvatarUrl + '" ' \
+                                        'title="' + translate[idx] + \
+                                        '" alt=" "' + avatarPosition + \
+                                        '/></a>\n    </div>\n'
                         else:
                             titleStr += \
                                 '    <img loading="lazy" title="' + \