GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bugs in atheme2json.py

This commit is contained in:
Shivaram Lingamneni 2020-12-07 02:53:45 -05:00
parent d4dd161c45
commit 31003bd02d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
distrib/atheme/atheme2json.py
View File

@ -6,7 +6,7 @@ import re
import sys import sys
from collections import defaultdict from collections import defaultdict
MASK_MAGIC_REGEX = re.compile(r'[*?!@]') MASK_MAGIC_REGEX = re.compile(r'[*?!@$]')
def to_unixnano(timestamp): def to_unixnano(timestamp):
return int(timestamp) * (10**9) return int(timestamp) * (10**9)
@ -103,8 +103,6 @@ def convert(infile):
# channel access lists # channel access lists
# CA #mychannel shivaram +AFORafhioqrstv 1600134478 shivaram # CA #mychannel shivaram +AFORafhioqrstv 1600134478 shivaram
chname, username, flags, set_at = parts[1], parts[2], parts[3], int(parts[4]) chname, username, flags, set_at = parts[1], parts[2], parts[3], int(parts[4])
if MASK_MAGIC_REGEX.search(username):
continue
chname = parts[1] chname = parts[1]
chdata = out['channels'][chname] chdata = out['channels'][chname]
flags = parts[3] flags = parts[3]
@ -130,7 +128,16 @@ def convert(infile):
channel_to_founder[chname] = (username, set_at) channel_to_founder[chname] = (username, set_at)
# but multiple people can receive the 'q' amode # but multiple people can receive the 'q' amode
chdata['amode'][username] = 'q' chdata['amode'][username] = 'q'
elif 'q' in flags: continue
if MASK_MAGIC_REGEX.search(username):
# ignore groups, masks, etc. for any field other than founder
continue
# record the first appearing successor, if necessary
if 'S' in flags:
if not chdata.get('successor'):
chdata['successor'] = username
# finally, handle amodes
if 'q' in flags:
chdata['amode'][username] = 'q' chdata['amode'][username] = 'q'
elif 'a' in flags: elif 'a' in flags:
chdata['amode'][username] = 'a' chdata['amode'][username] = 'a'
@ -140,10 +147,6 @@ 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