indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Test showing display name in follow list

merge-requests/30/head
Bob Mottram 2021-01-12 10:18:00 +00:00
parent 1bb4eab631
commit b57a8107ed
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
webapp_profile.py
View File

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