chore: ruff formatting

This commit is contained in:
neoarz
2025-11-02 23:32:52 -05:00
parent 2ce2c69a87
commit 1eff6c9f53
91 changed files with 3824 additions and 2518 deletions

View File

@@ -29,9 +29,11 @@ class Events(commands.GroupCog, name="events"):
embed = discord.Embed(
title="Events Commands",
description="Use `.events <subcommand>` or `/events <subcommand>`.",
color=0x7289DA
color=0x7289DA,
)
embed.set_author(
name="Events", icon_url="https://yes.nighty.works/raw/eW5lLm.webp"
)
embed.set_author(name="Events", icon_url="https://yes.nighty.works/raw/eW5lLm.webp")
embed.add_field(name="Available", value="baitbot", inline=False)
await context.send(embed=embed)
@@ -46,12 +48,11 @@ class Events(commands.GroupCog, name="events"):
@has_protected_role()
async def events_group_baitbot(self, context: Context):
await self._invoke_hybrid(context, "baitbot")
@commands.check(_require_group_prefix)
@has_protected_role()
@commands.hybrid_command(
name="baitbot",
description="View bait bot configuration and status."
name="baitbot", description="View bait bot configuration and status."
)
async def baitbot(self, context):
return await baitbot_command()(self, context)
@@ -60,8 +61,8 @@ class Events(commands.GroupCog, name="events"):
async def setup(bot) -> None:
cog = Events(bot)
await bot.add_cog(cog)
listener = BaitBotListener(bot)
await bot.add_cog(listener)
bot.logger.info("Loaded extension 'events.baitbot'")

View File

@@ -42,60 +42,80 @@ BAIT_CONFIGS = {
},
}
BAN_REASON = 'Detected bot/scammer in bait channel'
BAN_REASON = "Detected bot/scammer in bait channel"
def has_protected_role():
async def predicate(context: Context):
if not context.guild:
context.bot.logger.warning(f'[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in DMs')
context.bot.logger.warning(
f"[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in DMs"
)
embed = discord.Embed(
title="Permission Denied",
description="You don't have permission to use this command.",
color=0xE02B2B
color=0xE02B2B,
)
embed.set_author(
name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png"
)
embed.set_author(name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png")
await context.send(embed=embed, ephemeral=True)
return False
if not hasattr(context.author, 'roles'):
context.bot.logger.warning(f'[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in {context.guild.name} - no roles')
if not hasattr(context.author, "roles"):
context.bot.logger.warning(
f"[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in {context.guild.name} - no roles"
)
embed = discord.Embed(
title="Permission Denied",
description="You don't have permission to use this command.",
color=0xE02B2B
color=0xE02B2B,
)
embed.set_author(
name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png"
)
embed.set_author(name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png")
await context.send(embed=embed, ephemeral=True)
return False
for config in BAIT_CONFIGS.values():
protected_role_id = config.get("protected_role_id")
if protected_role_id:
protected_role = context.guild.get_role(protected_role_id)
if protected_role:
for role in context.author.roles:
if role.position >= protected_role.position and role.id != context.guild.default_role.id:
if (
role.position >= protected_role.position
and role.id != context.guild.default_role.id
):
return True
context.bot.logger.warning(f'[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in {context.guild.name} - insufficient role permissions')
context.bot.logger.warning(
f"[BAITBOT] Unauthorized baitbot command attempt by {context.author} ({context.author.id}) in {context.guild.name} - insufficient role permissions"
)
embed = discord.Embed(
title="Permission Denied",
description="You don't have permission to use this command.",
color=0xE02B2B
color=0xE02B2B,
)
embed.set_author(
name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png"
)
embed.set_author(name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png")
await context.send(embed=embed, ephemeral=True)
return False
return commands.check(predicate)
def baitbot_command():
async def wrapper(self, context: Context):
embed = discord.Embed(
title="Bait Bot",
description="Bans people who post in a specific channel.",
color=0x7289DA
color=0x7289DA,
)
embed.set_author(
name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png"
)
embed.set_author(name="Events", icon_url="https://yes.nighty.works/raw/C8Hh6o.png")
found_config = False
if BAIT_CONFIGS:
@@ -112,24 +132,36 @@ def baitbot_command():
channel_displays = []
for channel_id in channel_ids:
channel = context.guild.get_channel(channel_id)
channel_display = f"<#{channel_id}> (`{channel_id}`)" if channel else f"`{channel_id}`"
channel_display = (
f"<#{channel_id}> (`{channel_id}`)"
if channel
else f"`{channel_id}`"
)
channel_displays.append(channel_display)
channels_text = "\n".join(channel_displays) if channel_displays else "Not set"
channels_text = (
"\n".join(channel_displays) if channel_displays else "Not set"
)
role = context.guild.get_role(role_id)
role_display = f"<@&{role_id}> (`{role_id}`)" if role else f"`{role_id}`"
role_display = (
f"<@&{role_id}> (`{role_id}`)" if role else f"`{role_id}`"
)
log_channel_id = config.get("log_channel_id")
log_channel = None
if log_channel_id:
log_channel = context.guild.get_channel(log_channel_id)
log_display = f"<#{log_channel_id}> (`{log_channel_id}`)" if log_channel else (f"`{log_channel_id}`" if log_channel_id else "Not set")
log_display = (
f"<#{log_channel_id}> (`{log_channel_id}`)"
if log_channel
else (f"`{log_channel_id}`" if log_channel_id else "Not set")
)
embed.add_field(
name="\u200b",
value=f"Channels:\n{channels_text}\n\nProtected Role:\n{role_display}\n\nLog Channel:\n{log_display}",
inline=False
inline=False,
)
found_config = True
@@ -137,15 +169,17 @@ def baitbot_command():
embed.add_field(
name="No Configurations",
value="No bait channels configured for this server",
inline=False
inline=False,
)
if context.guild and context.guild.icon:
embed.set_thumbnail(url=context.guild.icon.url)
await context.send(embed=embed)
return wrapper
class BaitBotListener(commands.Cog):
def __init__(self, bot):
self.bot = bot
@@ -154,137 +188,200 @@ class BaitBotListener(commands.Cog):
async def on_message(self, message: discord.Message):
if message.guild is None:
return
if message.author.bot:
return
bait_config = None
config_name = None
for name, config in BAIT_CONFIGS.items():
if message.guild.id != config.get("guild_id"):
continue
channel_ids = config.get("channel_ids", [])
if not channel_ids:
channel_id = config.get("channel_id")
if channel_id:
channel_ids = [channel_id]
if message.channel.id in channel_ids:
bait_config = config
config_name = name
break
if not bait_config:
return
protected_role_id = bait_config.get("protected_role_id")
is_protected = False
if protected_role_id and hasattr(message.author, 'roles'):
if protected_role_id and hasattr(message.author, "roles"):
protected_role = message.guild.get_role(protected_role_id)
if protected_role:
for role in message.author.roles:
if role.position >= protected_role.position and role.id != message.guild.default_role.id:
self.bot.logger.info(f'[BAITBOT] Skipped banning {message.author} ({message.author.id}) in #{message.channel.name}: protected role ({role.name})')
if (
role.position >= protected_role.position
and role.id != message.guild.default_role.id
):
self.bot.logger.info(
f"[BAITBOT] Skipped banning {message.author} ({message.author.id}) in #{message.channel.name}: protected role ({role.name})"
)
is_protected = True
break
message_content = message.content if message.content else "*No text content*"
message_attachments = message.attachments
message_embeds = message.embeds
try:
await message.delete()
self.bot.logger.info(f'[BAITBOT] Deleted message from {message.author} in #{message.channel.name}')
self.bot.logger.info(
f"[BAITBOT] Deleted message from {message.author} in #{message.channel.name}"
)
except Exception as e:
self.bot.logger.warning(f'[BAITBOT] Could not delete message from {message.author}: {e}')
self.bot.logger.warning(
f"[BAITBOT] Could not delete message from {message.author}: {e}"
)
banned = False
if not is_protected:
try:
self.bot.logger.warning(f'[BAITBOT] Detected user in bait channel [{config_name}]: {message.author.name} ({message.author.id}) in #{message.channel.name}')
self.bot.logger.warning(
f"[BAITBOT] Detected user in bait channel [{config_name}]: {message.author.name} ({message.author.id}) in #{message.channel.name}"
)
if not message.guild.me.guild_permissions.ban_members:
self.bot.logger.error(f'[BAITBOT] No permission to ban members in {message.guild.name}')
self.bot.logger.error(
f"[BAITBOT] No permission to ban members in {message.guild.name}"
)
else:
try:
await message.author.ban(reason=BAN_REASON, delete_message_days=7)
self.bot.logger.info(f'[BAITBOT] Banned {message.author.name} - deleted messages from last 7 days')
await message.author.ban(
reason=BAN_REASON, delete_message_days=7
)
self.bot.logger.info(
f"[BAITBOT] Banned {message.author.name} - deleted messages from last 7 days"
)
banned = True
except discord.Forbidden:
self.bot.logger.error(f'[BAITBOT] Could not ban {message.author.name}: missing permissions')
self.bot.logger.error(
f"[BAITBOT] Could not ban {message.author.name}: missing permissions"
)
except Exception as e:
self.bot.logger.error(f'[BAITBOT] Error banning {message.author.name}: {e}')
self.bot.logger.error(
f"[BAITBOT] Error banning {message.author.name}: {e}"
)
if banned:
await asyncio.sleep(2)
try:
await message.guild.unban(message.author, reason="Auto-unban after cleanup")
self.bot.logger.info(f'[BAITBOT] Unbanned {message.author.name} - cleanup complete')
await message.guild.unban(
message.author, reason="Auto-unban after cleanup"
)
self.bot.logger.info(
f"[BAITBOT] Unbanned {message.author.name} - cleanup complete"
)
except Exception as e:
self.bot.logger.error(f'[BAITBOT] Error unbanning {message.author.name}: {e}')
self.bot.logger.error(
f"[BAITBOT] Error unbanning {message.author.name}: {e}"
)
except Exception as e:
self.bot.logger.error(f'[BAITBOT] Error handling bait message: {e}')
self.bot.logger.error(f"[BAITBOT] Error handling bait message: {e}")
log_channel_id = bait_config.get("log_channel_id")
if log_channel_id:
try:
log_channel = self.bot.get_channel(log_channel_id)
if log_channel:
action_text = "Message deleted (user banned and unbanned)" if banned else "Message deleted (protected user)" if is_protected else "Message deleted"
action_text = (
"Message deleted (user banned and unbanned)"
if banned
else "Message deleted (protected user)"
if is_protected
else "Message deleted"
)
log_embed = discord.Embed(
title="Bait Bot",
description=action_text,
color=0xE02B2B,
timestamp=message.created_at
timestamp=message.created_at,
)
log_embed.set_author(name=str(message.author), icon_url=message.author.display_avatar.url)
log_embed.add_field(name="User", value=message.author.mention, inline=True)
log_embed.add_field(name="Channel", value=message.channel.mention, inline=True)
log_embed.set_author(
name=str(message.author),
icon_url=message.author.display_avatar.url,
)
log_embed.add_field(
name="User", value=message.author.mention, inline=True
)
log_embed.add_field(
name="Channel", value=message.channel.mention, inline=True
)
combined_content = []
if message_content and message_content != "*No text content*":
combined_content.append(message_content)
image_url = None
if message_attachments:
for attachment in message_attachments:
if attachment.content_type and attachment.content_type.startswith("image/"):
if (
attachment.content_type
and attachment.content_type.startswith("image/")
):
if not image_url:
image_url = attachment.url
combined_content.append(attachment.filename)
content_text = "\n".join(combined_content) if combined_content else "*No content*"
content_text = (
"\n".join(combined_content)
if combined_content
else "*No content*"
)
if len(content_text) > 1000:
content_text = content_text[:997] + "..."
log_embed.add_field(name="Content", value=f"```\n{content_text}\n```", inline=False)
log_embed.add_field(
name="Content", value=f"```\n{content_text}\n```", inline=False
)
if image_url:
log_embed.set_image(url=image_url)
if message_embeds:
embed_info = []
for embed in message_embeds[:3]:
embed_desc = f"**Embed:** {embed.title or 'Untitled'}\n"
if embed.description:
desc_text = embed.description[:200] + "..." if len(embed.description) > 200 else embed.description
desc_text = (
embed.description[:200] + "..."
if len(embed.description) > 200
else embed.description
)
embed_desc += f"{desc_text}\n"
if embed.url:
embed_desc += f"[Link]({embed.url})"
embed_info.append(embed_desc)
if embed_info:
log_embed.add_field(name="Embeds", value="\n\n".join(embed_info), inline=False)
log_embed.add_field(
name="Embeds",
value="\n\n".join(embed_info),
inline=False,
)
log_embed.set_footer(text=f"Message ID: {message.id}")
try:
await log_channel.send(embed=log_embed)
self.bot.logger.info(f'[BAITBOT] Sent log to #{log_channel.name}')
self.bot.logger.info(
f"[BAITBOT] Sent log to #{log_channel.name}"
)
except discord.Forbidden:
self.bot.logger.error(f'[BAITBOT] No permission to send log to #{log_channel.name}')
self.bot.logger.error(
f"[BAITBOT] No permission to send log to #{log_channel.name}"
)
except Exception as e:
self.bot.logger.error(f'[BAITBOT] Error sending log: {e}')
self.bot.logger.error(f"[BAITBOT] Error sending log: {e}")
else:
self.bot.logger.warning(f'[BAITBOT] Log channel {log_channel_id} not found')
self.bot.logger.warning(
f"[BAITBOT] Log channel {log_channel_id} not found"
)
except Exception as e:
self.bot.logger.error(f'[BAITBOT] Error handling log channel: {e}')
self.bot.logger.error(f"[BAITBOT] Error handling log channel: {e}")