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

Merge pull request #1432 from slingamn/issue1431_topic

Browse Source 
fix #1431
This commit is contained in:
Shivaram Lingamneni 2020-12-06 09:59:10 -08:00 committed by GitHub
commit 82332b3f37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/atheme/atheme2json.py
View File

@ -91,7 +91,7 @@ def convert(infile):
chname = parts[1] chname = parts[1]
category = parts[2] category = parts[2]
if category == 'private:topic:text': if category == 'private:topic:text':
out['channels'][chname]['topic'] = parts[3] out['channels'][chname]['topic'] = line.split(maxsplit=3)[3]
elif category == 'private:topic:setter': elif category == 'private:topic:setter':
out['channels'][chname]['topicSetBy'] = parts[3] out['channels'][chname]['topicSetBy'] = parts[3]
elif category == 'private:topic:ts': elif category == 'private:topic:ts':
@ -115,7 +115,7 @@ def convert(infile):
try: try:
group_founder = groups_to_user[username] group_founder = groups_to_user[username]
print(f"WARNING: flattening GroupServ group founder {username} on {chname} to first group founder {group_founder}") print(f"WARNING: flattening GroupServ group founder {username} on {chname} to first group founder {group_founder}")
except KeyError as e: except KeyError:
raise ValueError(f"Got channel {chname} owned by group {username} that has no founder?") raise ValueError(f"Got channel {chname} owned by group {username} that has no founder?")
else: else:
username = group_founder username = group_founder