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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-27 15:37:31 +00:00
parent b399bdc5ee
commit 6c928801fa
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -299,7 +299,7 @@ from utils import getStatusNumber
from utils import urlPermitted from utils import urlPermitted
from utils import load_json from utils import load_json
from utils import save_json from utils import save_json
from utils import isSuspended from utils import is_suspended
from utils import dangerousMarkup from utils import dangerousMarkup
from utils import refresh_newswire from utils import refresh_newswire
from utils import isImageFile from utils import isImageFile
@ -1749,7 +1749,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
if self.server.login_failure_count.get(ipAddress): if self.server.login_failure_count.get(ipAddress):
del self.server.login_failure_count[ipAddress] del self.server.login_failure_count[ipAddress]
if isSuspended(base_dir, loginNickname): if is_suspended(base_dir, loginNickname):
msg = \ msg = \
htmlSuspended(self.server.cssCache, htmlSuspended(self.server.cssCache,
base_dir).encode('utf-8') base_dir).encode('utf-8')

4
newswire.py
View File

@ -27,7 +27,7 @@ from utils import isPublicPost
from utils import locate_post from utils import locate_post
from utils import load_json from utils import load_json
from utils import save_json from utils import save_json
from utils import isSuspended from utils import is_suspended
from utils import containsInvalidChars from utils import containsInvalidChars
from utils import removeHtml from utils import removeHtml
from utils import is_account_dir from utils import is_account_dir
@ -1099,7 +1099,7 @@ def _addBlogsToNewswire(base_dir: str, domain: str, newswire: {},
nickname = handle.split('@')[0] nickname = handle.split('@')[0]
# has this account been suspended? # has this account been suspended?
if isSuspended(base_dir, nickname): if is_suspended(base_dir, nickname):
continue continue
if os.path.isfile(base_dir + '/accounts/' + handle + if os.path.isfile(base_dir + '/accounts/' + handle +

14
utils.py
View File

@ -529,18 +529,18 @@ def get_config_param(base_dir: str, variableName: str):
return None 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 """Returns true if the given nickname is suspended
""" """
adminNickname = get_config_param(base_dir, 'admin') admin_nickname = get_config_param(base_dir, 'admin')
if not adminNickname: if not admin_nickname:
return False return False
if nickname == adminNickname: if nickname == admin_nickname:
return False return False
suspendedFilename = base_dir + '/accounts/suspended.txt' suspended_filename = base_dir + '/accounts/suspended.txt'
if os.path.isfile(suspendedFilename): if os.path.isfile(suspended_filename):
with open(suspendedFilename, 'r') as f: with open(suspended_filename, 'r') as f:
lines = f.readlines() lines = f.readlines()
for suspended in lines: for suspended in lines:
if suspended.strip('\n').strip('\r') == nickname: if suspended.strip('\n').strip('\r') == nickname: