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

Enact a bunch of suggestions by pylint

Browse source
This commit is contained in:
Marc Di Luzio 2024-08-09 22:28:02 +01:00
parent 354e202b18
commit 31cbdf61ab
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
matchy.py
View file

@ -1,7 +1,10 @@
import discord """
matchy.py - Discord bot that matches people into groups
"""
import random import random
import logging import logging
import importlib import importlib
import discord
from discord import app_commands from discord import app_commands
from discord.ext import commands from discord.ext import commands
# Config contains # Config contains
@ -35,23 +38,26 @@ async def sync(ctx: commands.Context):
"""Handle sync command""" """Handle sync command"""
msg = await ctx.reply("Reloading config...", ephemeral=True) msg = await ctx.reply("Reloading config...", ephemeral=True)
importlib.reload(config) importlib.reload(config)
logger.info(f"Reloaded config") logger.info("Reloaded config")
await msg.edit(content="Syncing commands...") await msg.edit(content="Syncing commands...")
synced = await bot.tree.sync() synced = await bot.tree.sync()
logger.info(f"Synced {len(synced)} command(s)") logger.info("Synced %s command(s)", len(synced))
await msg.edit(content="Done!") await msg.edit(content="Done!")
@bot.tree.command(description="Match up matchees") @bot.tree.command(description="Match up matchees")
@commands.guild_only() @commands.guild_only()
@app_commands.describe(group_min="Minimum matchees per match (defaults to 3)", matchee_role="Role for matchees (defaults to @Matchee)") @app_commands.describe(group_min="Minimum matchees per match (defaults to 3)",
matchee_role="Role for matchees (defaults to @Matchee)")
async def match(interaction: discord.Interaction, group_min: int = None, matchee_role: str = None): async def match(interaction: discord.Interaction, group_min: int = None, matchee_role: str = None):
"""Match groups of channel members""" """Match groups of channel members"""
logger.info(f"User {interaction.user} from {interaction.guild.name} in #{interaction.channel.name} requested " logger.info("Handling request '/match group_min=%s matchee_role=%s'",
+ f"'/match group_min={group_min} matchee_role={matchee_role}'") group_min, matchee_role)
logger.info("User %s from %s in #%s", interaction.user,
interaction.guild.name, interaction.channel.name)
# Sort out the defaults, if not specified they'll come in as None # Sort out the defaults, if not specified they'll come in as None
if not group_min: if not group_min:
@ -78,11 +84,13 @@ async def match(interaction: discord.Interaction, group_min: int = None, matchee
msg = f"{'\n'.join(group_to_message(g) for g in groups)}" msg = f"{'\n'.join(group_to_message(g) for g in groups)}"
if not matcher: # Let a non-matcher know why they don't have the button if not matcher: # Let a non-matcher know why they don't have the button
msg += f"\nYou'll need the { msg += f"\nYou'll need the {
matcher_role.mention if matcher_role else 'Matcher'} role to send this to the channel, sorry!" matcher_role.mention if matcher_role else 'Matcher'}"
await interaction.response.send_message(msg, ephemeral=True, silent=True, view=(GroupMessageButton(groups) if matcher else discord.utils.MISSING)) msg += " role to send this to the channel, sorry!"
await interaction.response.send_message(msg, ephemeral=True, silent=True,
view=(GroupMessageButton(groups) if matcher else discord.utils.MISSING))
logger.info(f"Done. Matched {len(matchees)} matchees into { logger.info("Done. Matched %s matchees into %s groups.",
len(groups)} groups.") len(matchees), len(groups))
async def send_groups_to_channel(channel: discord.channel, groups: list[list[discord.Member]]): async def send_groups_to_channel(channel: discord.channel, groups: list[list[discord.Member]]):
@ -100,12 +108,14 @@ class GroupMessageButton(discord.ui.View):
super().__init__(timeout=timeout) super().__init__(timeout=timeout)
@discord.ui.button(label="Send groups to channel", style=discord.ButtonStyle.green, emoji="📮") @discord.ui.button(label="Send groups to channel", style=discord.ButtonStyle.green, emoji="📮")
async def send_to_channel(self, interaction: discord.Interaction, button: discord.ui.Button): async def send_to_channel(self, interaction: discord.Interaction, _button: discord.ui.Button):
"""Send the groups to the channel with the button is pressed"""
await send_groups_to_channel(interaction.channel, self.groups) await send_groups_to_channel(interaction.channel, self.groups)
await interaction.response.edit_message(content=f"Groups sent to channel!", view=None) await interaction.response.edit_message(content="Groups sent to channel!", view=None)
def matchees_to_groups(matchees: list[discord.Member], per_group: int) -> list[list[discord.Member]]: def matchees_to_groups(matchees: list[discord.Member],
per_group: int) -> list[list[discord.Member]]:
"""Generate the groups from the set of matchees""" """Generate the groups from the set of matchees"""
random.shuffle(matchees) random.shuffle(matchees)
num_groups = max(len(matchees)//per_group, 1) num_groups = max(len(matchees)//per_group, 1)
@ -116,7 +126,7 @@ def group_to_message(group: list[discord.Member]) -> str:
"""Get the message to send for each group""" """Get the message to send for each group"""
mentions = [m.mention for m in group] mentions = [m.mention for m in group]
if len(group) > 1: if len(group) > 1:
mentions = "{} and {}".format(', '.join(mentions[:-1]), mentions[-1]) mentions = f"{', '.join(mentions[:-1])} and {mentions[-1]}"
else: else:
mentions = mentions[0] mentions = mentions[0]
return f"Matched up {mentions}!" return f"Matched up {mentions}!"