From 536a69e8ef2343403bc4a3114180375f6b9ed979 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 19 Dec 2020 12:55:40 +0000 Subject: [PATCH] Filter display name --- daemon.py | 8 ++++++-- webapp_profile.py | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index 28d8c93d..9a8ac40b 100644 --- a/daemon.py +++ b/daemon.py @@ -3885,9 +3885,13 @@ class PubServer(BaseHTTPRequestHandler): # change displayed name if fields.get('displayNickname'): if fields['displayNickname'] != actorJson['name']: - actorJson['name'] = \ + displayName = \ removeHtml(fields['displayNickname']) - actorChanged = True + if not isFiltered(baseDir, + nickname, domain, + displayName): + actorJson['name'] = displayName + actorChanged = True # change media instance status if fields.get('mediaInstance'): diff --git a/webapp_profile.py b/webapp_profile.py index a60256b1..625c75c0 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -881,7 +881,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, PGPpubKey = getPGPpubKey(actorJson) PGPfingerprint = getPGPfingerprint(actorJson) if actorJson.get('name'): - displayNickname = actorJson['name'] + if not isFiltered(baseDir, nickname, domain, actorJson['name']): + displayNickname = actorJson['name'] if actorJson.get('summary'): bioStr = \ actorJson['summary'].replace('

', '').replace('

', '')