mdiluz/matchy
mdiluz/matchy
1
0
Fork 0
Code Issues 5 Pull requests 7 Packages 1 Activity Actions

Fix up merge conflicts

Browse source
This commit is contained in:
Marc Di Luzio 2024-08-17 22:45:20 +01:00
parent 381756ce91
commit b5c86f51ca
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matchy/cogs/matcher.py
View file

@ -261,7 +261,7 @@ class MatchDynamicButton(discord.ui.DynamicItem[discord.ui.Button],
async def match_groups_in_channel(channel: discord.channel, min: int): async def match_groups_in_channel(channel: discord.channel, min: int):
"""Match up the groups in a given channel""" """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 # Send the groups
for group in groups: for group in groups:

2
matchy/matching.py
View file

@ -193,6 +193,6 @@ def get_matchees_in_channel(channel: discord.channel):
def active_members_to_groups(channel: discord.channel, min_members: int): def active_members_to_groups(channel: discord.channel, min_members: int):
"""Helper to create groups from channel members""" """Helper to create groups from channel members"""
# Gather up the prospective matchees # Gather up the prospective matchees
matchees = get_matchees_in_channel(channel) (matchees, _) = get_matchees_in_channel(channel)
# Create our groups! # Create our groups!
return members_to_groups(matchees, min_members, allow_fallback=True) return members_to_groups(matchees, min_members, allow_fallback=True)