From b5c86f51ca529f2e0fb5fc566ec6ca300f245ead Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Sat, 17 Aug 2024 22:45:20 +0100 Subject: [PATCH] Fix up merge conflicts --- matchy/cogs/matcher.py | 2 +- matchy/matching.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matchy/cogs/matcher.py b/matchy/cogs/matcher.py index 420c60e..fb33b42 100644 --- a/matchy/cogs/matcher.py +++ b/matchy/cogs/matcher.py @@ -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: diff --git a/matchy/matching.py b/matchy/matching.py index 465dac5..f23407f 100644 --- a/matchy/matching.py +++ b/matchy/matching.py @@ -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)