From c2eed4b7622b969ecd41f7598942638e21695f88 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 22 Jan 2021 22:12:31 +0000 Subject: [PATCH] Set other accounts within profile --- daemon.py | 29 +++++++++++++++++++++++++++++ webapp_profile.py | 16 ++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/daemon.py b/daemon.py index dd3156728..ff72046bb 100644 --- a/daemon.py +++ b/daemon.py @@ -4311,6 +4311,35 @@ class PubServer(BaseHTTPRequestHandler): del actorJson['movedTo'] actorChanged = True + # Other accounts (alsoKnownAs) + alsoKnownAs = [] + if actorJson.get('alsoKnownAs'): + alsoKnownAs = actorJson['alsoKnownAs'] + if fields.get('alsoKnownAs'): + alsoKnownAsStr = '' + alsoKnownAsCtr = 0 + for altActor in alsoKnownAs: + if alsoKnownAsCtr > 0: + alsoKnownAsStr += ', ' + alsoKnownAsStr += altActor + alsoKnownAsCtr += 1 + if fields['alsoKnownAs'] != alsoKnownAsStr and \ + '://' in fields['alsoKnownAs'] and \ + '@' not in fields['alsoKnownAs'] and \ + '.' in fields['alsoKnownAs']: + newAlsoKnownAs = fields['alsoKnownAs'].split(',') + alsoKnownAs = [] + for altActor in newAlsoKnownAs: + altActor = altActor.strip() + if '://' in altActor and '.' in altActor: + alsoKnownAs.append(altActor) + actorJson['alsoKnownAs'] = alsoKnownAs + actorChanged = True + else: + if alsoKnownAs: + del actorJson['alsoKnownAs'] + actorChanged = True + # change instance title if fields.get('instanceTitle'): currInstanceTitle = \ diff --git a/webapp_profile.py b/webapp_profile.py index 4737a96db..2648ad690 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1324,6 +1324,22 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, ' \n' + alsoKnownAsStr = '' + if actorJson.get('alsoKnownAs'): + alsoKnownAs = actorJson['alsoKnownAs'] + ctr = 0 + for altActor in alsoKnownAs: + if ctr > 0: + alsoKnownAsStr += ', ' + ctr += 1 + alsoKnownAsStr += altActor + + editProfileForm += '
\n' + editProfileForm += \ + ' \n' + editProfileForm += '
\n' editProfileForm += \