GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-13 07:29:30 +01:00
Code Issues Projects Releases Wiki Activity

fix #1403

Browse Source 
Handle the case where atheme had a successor, but didn't correctly
elect them as founder (?)
This commit is contained in:
Shivaram Lingamneni 2020-12-06 20:50:06 -05:00
parent b95afa1464
commit 468b5a4a39
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
distrib/atheme/atheme2json.py
View File

@ -140,14 +140,31 @@ def convert(infile):
chdata['amode'][username] = 'h' chdata['amode'][username] = 'h'
elif 'v' in flags or 'V' in flags: elif 'v' in flags or 'V' in flags:
chdata['amode'][username] = 'v' chdata['amode'][username] = 'v'
elif 'S' in flags:
# take the first entry as the successor
if not chdata.get('successor'):
chdata['successor'] = username
else: else:
pass pass
# do some basic integrity checks # do some basic integrity checks
def validate_user(name):
if not name:
return False
return bool(out['users'].get(name))
invalid_channels = []
for chname, chdata in out['channels'].items(): for chname, chdata in out['channels'].items():
founder = chdata.get('founder') if not validate_user(chdata.get('founder')):
if founder not in out['users']: if validate_user(chdata.get('successor')):
raise ValueError("no user corresponding to channel founder", chname, chdata.get('founder')) chdata['founder'] = chdata['successor']
else:
invalid_channels.append(chname)
for chname in invalid_channels:
logging.warning("Unable to find a valid founder for channel %s, discarding it", chname)
del out['channels'][chname]
return out return out