From b57a8107ed259f61492d6f3b6cb92377e92d27a2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 12 Jan 2021 10:18:00 +0000
Subject: [PATCH] Test showing display name in follow list

---
 webapp_profile.py | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index b11319267..e3261e92d 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1528,36 +1528,34 @@ def _individualFollowAsHtml(translate: {},
                             buttons=[]) -> str:
     """An individual follow entry on the profile screen
     """
-    nickname = getNicknameFromActor(followUrl)
-    domain, port = getDomainFromActor(followUrl)
-    titleStr = '@' + nickname + '@' + domain
+    followUrlNickname = getNicknameFromActor(followUrl)
+    followUrlDomain, followUrlPort = getDomainFromActor(followUrl)
+    followUrlDomainFull = getFullDomain(followUrlDomain, followUrlPort)
+    titleStr = '@' + followUrlNickname + '@' + followUrlDomainFull
     if dormant:
         titleStr += ' 💤'
     avatarUrl = getPersonAvatarUrl(baseDir, followUrl, personCache, True)
     if not avatarUrl:
         avatarUrl = followUrl + '/avatar.png'
-    if domain not in followUrl:
-        # lookup the correct webfinger for the followUrl
-        followUrlNickname = getNicknameFromActor(followUrl)
-        followUrlDomain, followUrlPort = getDomainFromActor(followUrl)
-        followUrlDomainFull = getFullDomain(followUrlDomain, followUrlPort)
-        followUrlHandle = followUrlNickname + '@' + followUrlDomainFull
-        followUrlWf = \
-            webfingerHandle(session, followUrlHandle, httpPrefix,
-                            cachedWebfingers,
-                            domain, __version__)
 
-        (inboxUrl, pubKeyId, pubKey,
-         fromPersonId, sharedInbox,
-         avatarUrl2, displayName) = getPersonBox(baseDir, session,
-                                                 followUrlWf,
-                                                 personCache, projectVersion,
-                                                 httpPrefix, nickname,
-                                                 domain, 'outbox', 43036)
-        if avatarUrl2:
-            avatarUrl = avatarUrl2
-        if displayName:
-            titleStr = displayName + ' ' + titleStr
+    # lookup the correct webfinger for the followUrl
+    followUrlHandle = followUrlNickname + '@' + followUrlDomainFull
+    followUrlWf = \
+        webfingerHandle(session, followUrlHandle, httpPrefix,
+                        cachedWebfingers,
+                        domain, __version__)
+
+    (inboxUrl, pubKeyId, pubKey,
+     fromPersonId, sharedInbox,
+     avatarUrl2, displayName) = getPersonBox(baseDir, session,
+                                             followUrlWf,
+                                             personCache, projectVersion,
+                                             httpPrefix, followUrlNickname,
+                                             domain, 'outbox', 43036)
+    if avatarUrl2:
+        avatarUrl = avatarUrl2
+    if displayName:
+        titleStr = displayName + ' ' + titleStr
 
     buttonsStr = ''
     if authorized: