Fix up merge conflicts
This commit is contained in:
parent
381756ce91
commit
b5c86f51ca
2 changed files with 2 additions and 2 deletions
|
@ -261,7 +261,7 @@ class MatchDynamicButton(discord.ui.DynamicItem[discord.ui.Button],
|
|||
|
||||
async def match_groups_in_channel(channel: discord.channel, min: int):
|
||||
"""Match up the groups in a given channel"""
|
||||
groups = matching.active_members_to_groups(state, channel, min)
|
||||
groups = matching.active_members_to_groups(channel, min)
|
||||
|
||||
# Send the groups
|
||||
for group in groups:
|
||||
|
|
|
@ -193,6 +193,6 @@ def get_matchees_in_channel(channel: discord.channel):
|
|||
def active_members_to_groups(channel: discord.channel, min_members: int):
|
||||
"""Helper to create groups from channel members"""
|
||||
# Gather up the prospective matchees
|
||||
matchees = get_matchees_in_channel(channel)
|
||||
(matchees, _) = get_matchees_in_channel(channel)
|
||||
# Create our groups!
|
||||
return members_to_groups(matchees, min_members, allow_fallback=True)
|
||||
|
|
Loading…
Add table
Reference in a new issue