mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check that admin user exists

main
Bob Mottram 2020-10-10 17:04:27 +01:00
parent 81fcf117b7
commit fb1d561bae
1 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
daemon.py
View File

@ -734,11 +734,12 @@ class PubServer(BaseHTTPRequestHandler):
return False return False
if self.server.debug: if self.server.debug:
print('DEBUG: mastodon api ' + self.path) print('DEBUG: mastodon api ' + self.path)
if self.path == '/api/v1/instance': adminNickname = getConfigParam(self.server.baseDir, 'admin')
adminNickname = getConfigParam(self.server.baseDir, 'admin') if adminNickname and self.path == '/api/v1/instance':
instanceDescriptionShort = \ instanceDescriptionShort = \
getConfigParam(self.server.baseDir, getConfigParam(self.server.baseDir,
'instanceDescriptionShort') 'instanceDescriptionShort')
instanceDescriptionShort = 'Yet another Epicyon Instance'
instanceDescription = getConfigParam(self.server.baseDir, instanceDescription = getConfigParam(self.server.baseDir,
'instanceDescription') 'instanceDescription')
instanceTitle = getConfigParam(self.server.baseDir, instanceTitle = getConfigParam(self.server.baseDir,
@ -3268,11 +3269,9 @@ class PubServer(BaseHTTPRequestHandler):
# change instance title # change instance title
if fields.get('instanceTitle'): if fields.get('instanceTitle'):
currInstanceTitle = \ currInstanceTitle = \
getConfigParam(baseDir, getConfigParam(baseDir, 'instanceTitle')
'instanceTitle')
if fields['instanceTitle'] != currInstanceTitle: if fields['instanceTitle'] != currInstanceTitle:
setConfigParam(baseDir, setConfigParam(baseDir, 'instanceTitle',
'instanceTitle',
fields['instanceTitle']) fields['instanceTitle'])
# change YouTube alternate domain # change YouTube alternate domain
@ -3311,8 +3310,7 @@ class PubServer(BaseHTTPRequestHandler):
setConfigParam(baseDir, setConfigParam(baseDir,
'instanceDescriptionShort', '') 'instanceDescriptionShort', '')
currInstanceDescription = \ currInstanceDescription = \
getConfigParam(baseDir, getConfigParam(baseDir, 'instanceDescription')
'instanceDescription')
if fields.get('instanceDescription'): if fields.get('instanceDescription'):
if fields['instanceDescription'] != \ if fields['instanceDescription'] != \
currInstanceDescription: currInstanceDescription:
@ -3348,60 +3346,61 @@ class PubServer(BaseHTTPRequestHandler):
if fields.get('moderators'): if fields.get('moderators'):
adminNickname = \ adminNickname = \
getConfigParam(baseDir, 'admin') getConfigParam(baseDir, 'admin')
if path.startswith('/users/' + if adminNickname:
adminNickname + '/'): if path.startswith('/users/' +
moderatorsFile = \ adminNickname + '/'):
baseDir + \ moderatorsFile = \
'/accounts/moderators.txt' baseDir + \
clearModeratorStatus(baseDir) '/accounts/moderators.txt'
if ',' in fields['moderators']: clearModeratorStatus(baseDir)
# if the list was given as comma separated if ',' in fields['moderators']:
modFile = open(moderatorsFile, "w+") # if the list was given as comma separated
mods = fields['moderators'].split(',') modFile = open(moderatorsFile, "w+")
for modNick in mods: mods = fields['moderators'].split(',')
modNick = modNick.strip() for modNick in mods:
modDir = baseDir + \ modNick = modNick.strip()
'/accounts/' + modNick + \ modDir = baseDir + \
'@' + domain '/accounts/' + modNick + \
if os.path.isdir(modDir): '@' + domain
modFile.write(modNick + '\n') if os.path.isdir(modDir):
modFile.close() modFile.write(modNick + '\n')
mods = fields['moderators'].split(',') modFile.close()
for modNick in mods: mods = fields['moderators'].split(',')
modNick = modNick.strip() for modNick in mods:
modDir = baseDir + \ modNick = modNick.strip()
'/accounts/' + modNick + \ modDir = baseDir + \
'@' + domain '/accounts/' + modNick + \
if os.path.isdir(modDir): '@' + domain
setRole(baseDir, if os.path.isdir(modDir):
modNick, domain, setRole(baseDir,
'instance', 'moderator') modNick, domain,
else: 'instance', 'moderator')
# nicknames on separate lines else:
modFile = open(moderatorsFile, "w+") # nicknames on separate lines
mods = fields['moderators'].split('\n') modFile = open(moderatorsFile, "w+")
for modNick in mods: mods = fields['moderators'].split('\n')
modNick = modNick.strip() for modNick in mods:
modDir = \ modNick = modNick.strip()
baseDir + \ modDir = \
'/accounts/' + modNick + \ baseDir + \
'@' + domain '/accounts/' + modNick + \
if os.path.isdir(modDir): '@' + domain
modFile.write(modNick + '\n') if os.path.isdir(modDir):
modFile.close() modFile.write(modNick + '\n')
mods = fields['moderators'].split('\n') modFile.close()
for modNick in mods: mods = fields['moderators'].split('\n')
modNick = modNick.strip() for modNick in mods:
modDir = \ modNick = modNick.strip()
baseDir + \ modDir = \
'/accounts/' + \ baseDir + \
modNick + '@' + \ '/accounts/' + \
domain modNick + '@' + \
if os.path.isdir(modDir): domain
setRole(baseDir, if os.path.isdir(modDir):
modNick, domain, setRole(baseDir,
'instance', modNick, domain,
'moderator') 'instance',
'moderator')
# remove scheduled posts # remove scheduled posts
if fields.get('removeScheduledPosts'): if fields.get('removeScheduledPosts'):