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

Add API endpoint for logging new switches (+ refactor)

Browse Source
This commit is contained in:
Ske
2018-12-10 22:00:34 +01:00
parent 121f8ab8c3
commit 8ccee1d6fa
7 changed files with 144 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pluralkit/bot/commands/member_commands.py
View File

@@ -12,11 +12,10 @@ async def member_root(ctx: CommandContext):
elif ctx.match("set"):
await member_set(ctx)
# TODO "pk;member list"
if not ctx.has_next():
elif not ctx.has_next():
raise CommandError("Must pass a subcommand. For a list of subcommands, type `pk;member help`.")
await specific_member_root(ctx)
else:
await specific_member_root(ctx)
async def specific_member_root(ctx: CommandContext):

13
src/pluralkit/bot/commands/switch_commands.py
View File

@@ -33,19 +33,6 @@ async def switch_member(ctx: CommandContext):
while ctx.has_next():
members.append(await ctx.pop_member())
# Compare requested switch IDs and existing fronter IDs to check for existing switches
# Lists, because order matters, it makes sense to just swap fronters
member_ids = [member.id for member in members]
fronter_ids = (await pluralkit.utils.get_fronter_ids(ctx.conn, system.id))[0]
if member_ids == fronter_ids:
if len(members) == 1:
raise CommandError("{} is already fronting.".format(members[0].name))
raise CommandError("Members {} are already fronting.".format(", ".join([m.name for m in members])))
# Also make sure there aren't any duplicates
if len(set(member_ids)) != len(member_ids):
raise CommandError("Duplicate members in member list.")
# Log the switch
await system.add_switch(ctx.conn, members)