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

Comment

merge-requests/30/head
Bob Mottram 2021-07-04 18:14:18 +01:00
parent a06186b26e
commit e30829416d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles.py
View File

@ -91,7 +91,8 @@ def _addRole(baseDir: str, nickname: str, domain: str,
with open(roleFile, 'w+') as f: with open(roleFile, 'w+') as f:
for roleNickname in lines: for roleNickname in lines:
roleNickname = roleNickname.strip('\n').strip('\r') roleNickname = roleNickname.strip('\n').strip('\r')
if len(roleNickname) > 1: if len(roleNickname) < 2:
continue
if os.path.isdir(baseDir + '/accounts/' + if os.path.isdir(baseDir + '/accounts/' +
roleNickname + '@' + domain): roleNickname + '@' + domain):
f.write(roleNickname + '\n') f.write(roleNickname + '\n')
@ -126,6 +127,7 @@ def _setActorRole(actorJson: {}, roleName: str) -> bool:
if not isinstance(actorJson['hasOccupation'], list): if not isinstance(actorJson['hasOccupation'], list):
return False return False
# occupation category from www.onetonline.org
category = None category = None
if 'admin' in roleName: if 'admin' in roleName:
category = '15-1299.01' category = '15-1299.01'
@ -228,8 +230,7 @@ def setRole(baseDir: str, nickname: str, domain: str,
# avoid giant strings # avoid giant strings
if len(role) > 128: if len(role) > 128:
return False return False
actorFilename = baseDir + '/accounts/' + \ actorFilename = baseDir + '/accounts/' + nickname + '@' + domain + '.json'
nickname + '@' + domain + '.json'
if not os.path.isfile(actorFilename): if not os.path.isfile(actorFilename):
return False return False