Implement better logging

This commit is contained in:
Marc Di Luzio 2024-08-08 23:32:52 +01:00
parent 081fc629a6
commit 60f769f8a9

View file

@ -1,9 +1,19 @@
import discord import discord
import random import random
import logging
from discord import app_commands from discord import app_commands
from discord.ext import commands from discord.ext import commands
# Config contains
# TOKEN : str - Discord bot token
# SERVERS : list[int] - ids of the servers to have commands active
# OWNERS : list[int] - ids of owners able to use the owner commands
import config import config
handler = logging.StreamHandler()
logger = logging.getLogger("matchy")
logger.setLevel(logging.INFO)
intents = discord.Intents.default() intents = discord.Intents.default()
intents.message_content = True intents.message_content = True
intents.members = True intents.members = True
@ -38,23 +48,22 @@ def sync_guilds():
for guild in bot.guilds: for guild in bot.guilds:
if guild.id in config.SERVERS: if guild.id in config.SERVERS:
guilds.append(guild) guilds.append(guild)
logger.info(f"Synced {len(guilds)} guild(s)")
print(f"Synced {len(guilds)} guild(s)")
@bot.event @bot.event
async def on_ready(): async def on_ready():
sync_guilds() sync_guilds()
print("Bot is Up and Ready!") logger.info("Bot is up and ready!")
@bot.command() @bot.command()
async def sync(ctx): async def sync(ctx):
if ctx.author.id not in config.OWNERS: if ctx.author.id not in config.OWNERS:
print(f"User {ctx.author} unauthorised for sync") logger.warning(f"User {ctx.author} unauthorised for sync")
return return
# Sync the commands # Sync the commands
synced = await bot.tree.sync() synced = await bot.tree.sync()
print(f"Synced {len(synced)} command(s)") logger.info(f"Synced {len(synced)} command(s)")
sync_guilds() sync_guilds()
@ -62,44 +71,49 @@ async def sync(ctx):
@bot.tree.command(description = "Match matchees into groups", guilds = list(g for g in guilds if g.id in config.SERVERS)) @bot.tree.command(description = "Match matchees into groups", guilds = list(g for g in guilds if g.id in config.SERVERS))
@app_commands.describe(per_group = "Matchees per group") @app_commands.describe(per_group = "Matchees per group")
async def match(interaction: discord.Interaction, per_group: int): async def match(interaction: discord.Interaction, per_group: int):
logger.info(f"User {interaction.user} requested /match {per_group}")
# Grab the roles # Grab the roles
matchee = find_role_by_name(interaction.guild.roles, "Matchee") matchee_role = find_role_by_name(interaction.guild.roles, "Matchee")
matcher = find_role_by_name(interaction.guild.roles, "Matcher") matcher_role = find_role_by_name(interaction.guild.roles, "Matcher")
if not matchee or not matcher: if not matchee_role or not matcher_role:
await interaction.response.send_message("Server has missing matchy roles :(", ephemeral=True) await interaction.response.send_message("Server has missing matchy roles :(", ephemeral=True)
return return
# Validate that the user has the scope we need # Validate that the user has the scope we need
if matcher not in interaction.user.roles: if matcher_role not in interaction.user.roles:
await interaction.response.send_message(f"You'll need the {matcher.mention} role to do this, sorry!", ephemeral=True) await interaction.response.send_message(f"You'll need the {matcher_role.mention} role to do this, sorry!", ephemeral=True)
return return
# Let the channel know the matching is starting
await interaction.channel.send(f"{interaction.user.display_name} asked me to match groups of {per_group}! :partying_face:") await interaction.channel.send(f"{interaction.user.display_name} asked me to match groups of {per_group}! :partying_face:")
# Find all the members in the role # Find all the members in the role
matchies = [] matchees = []
for member in interaction.channel.members: for member in interaction.channel.members:
if not member.bot and matchee in member.roles: if not member.bot and matchee_role in member.roles:
matchies.append(member) matchees.append(member)
break logger.info(f"{len(matchees)} matchees found")
# Shuffle the people for randomness # Shuffle the people for randomness
random.shuffle(matchies) random.shuffle(matchees)
# Calculate the number of groups to generate # Calculate the number of groups to generate
total_num = len(matchies) total_num = len(matchees)
num_groups = total_num//per_group num_groups = total_num//per_group
if not num_groups: # Account for when it rounds down to 0 if not num_groups: # Account for when it rounds down to 0
num_groups = 1 num_groups = 1
logger.info(f"Creating {num_groups} groups")
# Split members into groups and share them # Split members into groups and share them
groups = [matchies[i::num_groups] for i in range(num_groups)] groups = [matchees[i::num_groups] for i in range(num_groups)]
for idx, group in enumerate(groups): for idx, group in enumerate(groups):
mentions = [m.mention for m in group] mentions = [m.mention for m in group]
logger.info(f"Sending group: {list(m.name for m in group)}")
await interaction.channel.send(f"{get_ordinal(idx+1)} group: " + ", ".join(mentions)) await interaction.channel.send(f"{get_ordinal(idx+1)} group: " + ", ".join(mentions))
logger.info(f"Done")
await interaction.response.send_message("Done :)", ephemeral=True, silent=True) await interaction.response.send_message("Done :)", ephemeral=True, silent=True)
bot.run(config.TOKEN) bot.run(config.TOKEN, log_handler=handler, root_logger=True)