mirror of https://gitlab.com/bashrc2/epicyon
More checks that admin user is defined
parent
fb1d561bae
commit
22f31f0356
|
@ -789,6 +789,8 @@ def suspendAccount(baseDir: str, nickname: str, domain: str) -> None:
|
||||||
"""
|
"""
|
||||||
# Don't suspend the admin
|
# Don't suspend the admin
|
||||||
adminNickname = getConfigParam(baseDir, 'admin')
|
adminNickname = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminNickname:
|
||||||
|
return
|
||||||
if nickname == adminNickname:
|
if nickname == adminNickname:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -843,6 +845,8 @@ def canRemovePost(baseDir: str, nickname: str,
|
||||||
|
|
||||||
# is the post by the admin?
|
# is the post by the admin?
|
||||||
adminNickname = getConfigParam(baseDir, 'admin')
|
adminNickname = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminNickname:
|
||||||
|
return False
|
||||||
if domainFull + '/users/' + adminNickname + '/' in postId:
|
if domainFull + '/users/' + adminNickname + '/' in postId:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -899,6 +903,8 @@ def removeAccount(baseDir: str, nickname: str,
|
||||||
"""
|
"""
|
||||||
# Don't remove the admin
|
# Don't remove the admin
|
||||||
adminNickname = getConfigParam(baseDir, 'admin')
|
adminNickname = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminNickname:
|
||||||
|
return False
|
||||||
if nickname == adminNickname:
|
if nickname == adminNickname:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
10
posts.py
10
posts.py
|
@ -74,14 +74,20 @@ def isModerator(baseDir: str, nickname: str) -> bool:
|
||||||
moderatorsFile = baseDir + '/accounts/moderators.txt'
|
moderatorsFile = baseDir + '/accounts/moderators.txt'
|
||||||
|
|
||||||
if not os.path.isfile(moderatorsFile):
|
if not os.path.isfile(moderatorsFile):
|
||||||
if getConfigParam(baseDir, 'admin') == nickname:
|
adminName = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminName:
|
||||||
|
return False
|
||||||
|
if adminName == nickname:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
with open(moderatorsFile, "r") as f:
|
with open(moderatorsFile, "r") as f:
|
||||||
lines = f.readlines()
|
lines = f.readlines()
|
||||||
if len(lines) == 0:
|
if len(lines) == 0:
|
||||||
if getConfigParam(baseDir, 'admin') == nickname:
|
adminName = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminName:
|
||||||
|
return False
|
||||||
|
if adminName == nickname:
|
||||||
return True
|
return True
|
||||||
for moderator in lines:
|
for moderator in lines:
|
||||||
moderator = moderator.strip('\n').strip('\r')
|
moderator = moderator.strip('\n').strip('\r')
|
||||||
|
|
2
utils.py
2
utils.py
|
@ -58,6 +58,8 @@ def isSuspended(baseDir: str, nickname: str) -> bool:
|
||||||
"""Returns true if the given nickname is suspended
|
"""Returns true if the given nickname is suspended
|
||||||
"""
|
"""
|
||||||
adminNickname = getConfigParam(baseDir, 'admin')
|
adminNickname = getConfigParam(baseDir, 'admin')
|
||||||
|
if not adminNickname:
|
||||||
|
return False
|
||||||
if nickname == adminNickname:
|
if nickname == adminNickname:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue