From c5c8be599af3d2fbf24cf8b6ab75a170759a5d8b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 17 Dec 2020 09:50:04 +0000 Subject: [PATCH] Admin can override moderators --- webapp_person_options.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webapp_person_options.py b/webapp_person_options.py index 79596d0c..05633e7f 100644 --- a/webapp_person_options.py +++ b/webapp_person_options.py @@ -12,6 +12,7 @@ from petnames import getPetName from person import isPersonSnoozed from posts import isModerator from utils import getFullDomain +from utils import getConfigParam from utils import isDormant from utils import removeHtml from utils import getDomainFromActor @@ -183,8 +184,10 @@ def htmlPersonOptions(defaultTimeline: str, # checkbox for permission to post to newswire if optionsDomainFull == domainFull: - if isModerator(baseDir, nickname) and \ - not isModerator(baseDir, optionsNickname): + adminNickname = getConfigParam(baseDir, 'admin') + if (nickname == adminNickname or + (isModerator(baseDir, nickname) and + not isModerator(baseDir, optionsNickname))): newswireBlockedFilename = \ baseDir + '/accounts/' + \ optionsNickname + '@' + optionsDomain + '/.nonewswire'