diff --git a/daemon.py b/daemon.py index 41aeeba8b..2ec1729a3 100644 --- a/daemon.py +++ b/daemon.py @@ -299,7 +299,7 @@ from utils import getStatusNumber from utils import urlPermitted from utils import load_json from utils import save_json -from utils import isSuspended +from utils import is_suspended from utils import dangerousMarkup from utils import refresh_newswire from utils import isImageFile @@ -1749,7 +1749,7 @@ class PubServer(BaseHTTPRequestHandler): else: if self.server.login_failure_count.get(ipAddress): del self.server.login_failure_count[ipAddress] - if isSuspended(base_dir, loginNickname): + if is_suspended(base_dir, loginNickname): msg = \ htmlSuspended(self.server.cssCache, base_dir).encode('utf-8') diff --git a/newswire.py b/newswire.py index 3c23f27c1..baea8d339 100644 --- a/newswire.py +++ b/newswire.py @@ -27,7 +27,7 @@ from utils import isPublicPost from utils import locate_post from utils import load_json from utils import save_json -from utils import isSuspended +from utils import is_suspended from utils import containsInvalidChars from utils import removeHtml from utils import is_account_dir @@ -1099,7 +1099,7 @@ def _addBlogsToNewswire(base_dir: str, domain: str, newswire: {}, nickname = handle.split('@')[0] # has this account been suspended? - if isSuspended(base_dir, nickname): + if is_suspended(base_dir, nickname): continue if os.path.isfile(base_dir + '/accounts/' + handle + diff --git a/utils.py b/utils.py index 2f7039b45..f2f1f888e 100644 --- a/utils.py +++ b/utils.py @@ -529,18 +529,18 @@ def get_config_param(base_dir: str, variableName: str): return None -def isSuspended(base_dir: str, nickname: str) -> bool: +def is_suspended(base_dir: str, nickname: str) -> bool: """Returns true if the given nickname is suspended """ - adminNickname = get_config_param(base_dir, 'admin') - if not adminNickname: + admin_nickname = get_config_param(base_dir, 'admin') + if not admin_nickname: return False - if nickname == adminNickname: + if nickname == admin_nickname: return False - suspendedFilename = base_dir + '/accounts/suspended.txt' - if os.path.isfile(suspendedFilename): - with open(suspendedFilename, 'r') as f: + suspended_filename = base_dir + '/accounts/suspended.txt' + if os.path.isfile(suspended_filename): + with open(suspended_filename, 'r') as f: lines = f.readlines() for suspended in lines: if suspended.strip('\n').strip('\r') == nickname: