liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle hid collision case

Browse Source
This commit is contained in:
xBelladonna 2019-04-22 01:46:33 +09:30 committed by Astrid
parent a51fe5e759
commit e85776fae6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pluralkit/system.py
View File

@ -51,6 +51,8 @@ class System(namedtuple("System", ["id", "hid", "name", "description", "tag", "a
raise errors.ExistingSystemError() raise errors.ExistingSystemError()
new_hid = generate_hid() new_hid = generate_hid()
while await System.get_by_hid(conn, new_hid):
new_hid = generate_hid()
async with conn.transaction(): async with conn.transaction():
new_system = await db.create_system(conn, system_name, new_hid) new_system = await db.create_system(conn, system_name, new_hid)
@ -122,12 +124,13 @@ class System(namedtuple("System", ["id", "hid", "name", "description", "tag", "a
return await self.refresh_token(conn) return await self.refresh_token(conn)
async def create_member(self, conn, member_name: str) -> Member: async def create_member(self, conn, member_name: str) -> Member:
# TODO: figure out what to do if this errors out on collision on generate_hid
new_hid = generate_hid()
if len(member_name) > self.get_member_name_limit(): if len(member_name) > self.get_member_name_limit():
raise errors.MemberNameTooLongError(tag_present=bool(self.tag)) raise errors.MemberNameTooLongError(tag_present=bool(self.tag))
new_hid = generate_hid()
while await db.get_member_by_hid(conn, new_hid):
new_hid = generate_hid()
member = await db.create_member(conn, self.id, member_name, new_hid) member = await db.create_member(conn, self.id, member_name, new_hid)
return member return member