From 98fdf7d1f2afe2f68d91de6faec2e7702d1f8e3d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 12 Dec 2020 10:38:48 +0000
Subject: [PATCH] Substitute broken avatars on person options screen

---
 webapp_person_options.py | 3 ++-
 webapp_post.py           | 9 +--------
 webapp_utils.py          | 8 ++++++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp_person_options.py b/webapp_person_options.py
index d6c7c506f..89e142d03 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -18,6 +18,7 @@ from follow import isFollowingActor
 from followingCalendar import receivingCalendarEvents
 from webapp_utils import htmlHeaderWithExternalStyle
 from webapp_utils import htmlFooter
+from webapp_utils import getBrokenLinkSubstitute
 
 
 def htmlPersonOptions(defaultTimeline: str,
@@ -103,7 +104,7 @@ def htmlPersonOptions(defaultTimeline: str,
     optionsStr += '  <center>\n'
     optionsStr += '  <a href="' + optionsActor + '">\n'
     optionsStr += '  <img loading="lazy" src="' + optionsProfileUrl + \
-        '"/></a>\n'
+        '" ' + getBrokenLinkSubstitute() + '/></a>\n'
     handle = getNicknameFromActor(optionsActor) + '@' + optionsDomain
     optionsStr += \
         '  <p class="optionsText">' + translate['Options for'] + \
diff --git a/webapp_post.py b/webapp_post.py
index d4da8f7a8..3b2bf77d2 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -55,6 +55,7 @@ from webapp_utils import getContentWarningButton
 from webapp_utils import getPostAttachmentsAsHtml
 from webapp_utils import htmlHeaderWithExternalStyle
 from webapp_utils import htmlFooter
+from webapp_utils import getBrokenLinkSubstitute
 from webapp_media import addEmbeddedElements
 from webapp_question import insertQuestion
 from devices import E2EEdecryptMessageFromDevice
@@ -201,14 +202,6 @@ def getAvatarImageUrl(session,
     return avatarUrl
 
 
-def getBrokenLinkSubstitute() -> str:
-    """Returns html used to show a default image if the link to
-    an image is broken
-    """
-    return " onerror=\"this.onerror=null; this.src='" + \
-        "/icons/avatar_default.png'\""
-
-
 def getAvatarImageHtml(showAvatarOptions: bool,
                        nickname: str, domainFull: str,
                        avatarUrl: str, postActor: str,
diff --git a/webapp_utils.py b/webapp_utils.py
index b8caff443..9f2c6bf41 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -20,6 +20,14 @@ from content import addHtmlTags
 from content import replaceEmojiFromTags
 
 
+def getBrokenLinkSubstitute() -> str:
+    """Returns html used to show a default image if the link to
+    an image is broken
+    """
+    return " onerror=\"this.onerror=null; this.src='" + \
+        "/icons/avatar_default.png'\""
+
+
 def htmlFollowingList(cssCache: {}, baseDir: str,
                       followingFilename: str) -> str:
     """Returns a list of handles being followed