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

Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2021-11-05 23:41:17 +00:00
parent a4e4c4dbfd 6e42ba3e2f
commit dbac031ac4
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webapp_profile.py
View File

@ -9,6 +9,8 @@ __module_group__ = "Web Interface"
import os import os
from pprint import pprint from pprint import pprint
from webfinger import webfingerHandle
from utils import getDisplayName
from utils import isGroupAccount from utils import isGroupAccount
from utils import hasObjectDict from utils import hasObjectDict
from utils import getOccupationName from utils import getOccupationName
@ -33,10 +35,9 @@ from theme import getThemesList
from person import personBoxJson from person import personBoxJson
from person import getActorJson from person import getActorJson
from person import getPersonAvatarUrl from person import getPersonAvatarUrl
from webfinger import webfingerHandle from posts import getPersonBox
from posts import isModerator from posts import isModerator
from posts import parseUserFeed from posts import parseUserFeed
from posts import getPersonBox
from posts import isCreateInsideAnnounce from posts import isCreateInsideAnnounce
from donate import getDonationUrl from donate import getDonationUrl
from donate import getWebsite from donate import getWebsite
@ -1102,6 +1103,7 @@ def _htmlProfileFollowing(translate: {}, baseDir: str, httpPrefix: str,
translate['Page down'] + '" alt="' + \ translate['Page down'] + '" alt="' + \
translate['Page down'] + '"></a>\n' + \ translate['Page down'] + '"></a>\n' + \
' </center>\n' ' </center>\n'
return profileStr return profileStr
@ -2250,6 +2252,9 @@ def _individualFollowAsHtml(signingPrivateKeyPem: str,
if not avatarUrl: if not avatarUrl:
avatarUrl = followUrl + '/avatar.png' avatarUrl = followUrl + '/avatar.png'
displayName = getDisplayName(baseDir, followUrl, personCache)
isGroup = False
if not displayName:
# lookup the correct webfinger for the followUrl # lookup the correct webfinger for the followUrl
followUrlHandle = followUrlNickname + '@' + followUrlDomainFull followUrlHandle = followUrlNickname + '@' + followUrlDomainFull
followUrlWf = \ followUrlWf = \
@ -2269,6 +2274,7 @@ def _individualFollowAsHtml(signingPrivateKeyPem: str,
domain, 'outbox', 43036) domain, 'outbox', 43036)
if avatarUrl2: if avatarUrl2:
avatarUrl = avatarUrl2 avatarUrl = avatarUrl2
if displayName: if displayName:
displayName = \ displayName = \
addEmojiToDisplayName(None, baseDir, httpPrefix, addEmojiToDisplayName(None, baseDir, httpPrefix,
@ -2290,7 +2296,9 @@ def _individualFollowAsHtml(signingPrivateKeyPem: str,
translate['Block'] + '</button></a>\n' translate['Block'] + '</button></a>\n'
elif b == 'unfollow': elif b == 'unfollow':
unfollowStr = 'Unfollow' unfollowStr = 'Unfollow'
if isGroup: if isGroup or \
isGroupAccount(baseDir,
followUrlNickname, followUrlDomain):
unfollowStr = 'Leave' unfollowStr = 'Leave'
buttonsStr += \ buttonsStr += \
'<a href="/users/' + actorNickname + \ '<a href="/users/' + actorNickname + \