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-26 14:11:30 +00:00
parent 6604143504
commit ae2cef4569
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
person.py
View File

@ -822,8 +822,8 @@ def personUpgradeActor(base_dir: str, personJson: {},
# roles are configured # roles are configured
rolesList = getActorRolesList(personJson) rolesList = getActorRolesList(personJson)
if not rolesList: if not rolesList:
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if personJson['id'].endswith('/users/' + adminName): if personJson['id'].endswith('/users/' + admin_name):
rolesList = ["admin", "moderator", "editor"] rolesList = ["admin", "moderator", "editor"]
setRolesFromList(personJson, rolesList) setRolesFromList(personJson, rolesList)
updateActor = True updateActor = True

12
posts.py
View File

@ -96,20 +96,20 @@ def isModerator(base_dir: str, nickname: str) -> bool:
moderatorsFile = base_dir + '/accounts/moderators.txt' moderatorsFile = base_dir + '/accounts/moderators.txt'
if not os.path.isfile(moderatorsFile): if not os.path.isfile(moderatorsFile):
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == 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:
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == 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')

24
utils.py
View File

@ -292,20 +292,20 @@ def is_editor(base_dir: str, nickname: str) -> bool:
editorsFile = base_dir + '/accounts/editors.txt' editorsFile = base_dir + '/accounts/editors.txt'
if not os.path.isfile(editorsFile): if not os.path.isfile(editorsFile):
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == nickname:
return True return True
return False return False
with open(editorsFile, 'r') as f: with open(editorsFile, 'r') as f:
lines = f.readlines() lines = f.readlines()
if len(lines) == 0: if len(lines) == 0:
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == nickname:
return True return True
for editor in lines: for editor in lines:
editor = editor.strip('\n').strip('\r') editor = editor.strip('\n').strip('\r')
@ -320,20 +320,20 @@ def isArtist(base_dir: str, nickname: str) -> bool:
artistsFile = base_dir + '/accounts/artists.txt' artistsFile = base_dir + '/accounts/artists.txt'
if not os.path.isfile(artistsFile): if not os.path.isfile(artistsFile):
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == nickname:
return True return True
return False return False
with open(artistsFile, 'r') as f: with open(artistsFile, 'r') as f:
lines = f.readlines() lines = f.readlines()
if len(lines) == 0: if len(lines) == 0:
adminName = get_config_param(base_dir, 'admin') admin_name = get_config_param(base_dir, 'admin')
if not adminName: if not admin_name:
return False return False
if adminName == nickname: if admin_name == nickname:
return True return True
for artist in lines: for artist in lines:
artist = artist.strip('\n').strip('\r') artist = artist.strip('\n').strip('\r')