Skip to content

Remove members intent #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CGillen wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Remove members intent #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aee3f62
Remove members intent
CGillen Mar 19, 2026
4fbc96d
Exclude bots from inactivity check
CGillen Mar 19, 2026
6b4c2aa
Missed a line
CGillen Mar 19, 2026
ddf4a2b
It helps to remove the intent too
CGillen Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
249 changes: 0 additions & 249 deletions bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from pathlib import Path
from streamscrobbler import streamscrobbler
from favorites_manager import get_favorites_manager
from permissions import get_permission_manager, can_set_favorites_check, can_remove_favorites_check, can_manage_roles_check
from stream_validator import get_stream_validator
from input_validator import get_input_validator
from ui_components import FavoritesView, create_favorites_embed, create_favorites_list_embed, create_role_setup_embed, ConfirmationView
Expand Down Expand Up @@ -57,7 +56,6 @@
# END CLUSTERING

intents = discord.Intents.default()
intents.members = True
intents.guilds = True
intents.voice_states = True
# minimal member cache: only cache members related to events / interactions
Expand Down Expand Up @@ -457,253 +455,6 @@ async def maint(interaction: discord.Interaction, status: bool = True):
logger.info("😂 Pleb tried to put me in maintenance mode")
await interaction.response.send_message("Awww look at you, how cute")

### FAVORITES COMMANDS ###

@bot.tree.command(
name='set-favorite',
description="Add a radio station to favorites"
)
@discord.app_commands.checks.cooldown(rate=1, per=5)
@is_channel()
async def set_favorite(interaction: discord.Interaction, url: str, name: str = None):
# Check permissions
perm_manager = get_permission_manager()
if not perm_manager.can_set_favorites(interaction.guild.id, interaction.user):
await interaction.response.send_message(
"❌ You don't have permission to set favorites. Ask an admin to assign you the appropriate role.",
ephemeral=True
)
return

# Validate URL format first
if not is_valid_url(url):
await interaction.response.send_message("❌ Please provide a valid URL.", ephemeral=True)
return

await interaction.response.send_message("🔍 Validating stream and adding to favorites...")

try:
favorites_manager = get_favorites_manager()
result = await favorites_manager.add_favorite(
guild_id=interaction.guild.id,
url=url,
name=name,
user_id=interaction.user.id
)

if result['success']:
await interaction.edit_original_response(
content=f"✅ Added **{result['station_name']}** as favorite #{result['favorite_number']}"
)
else:
await interaction.edit_original_response(
content=f"❌ Failed to add favorite: {result['error']}"
)

except Exception as e:
logger.error(f"Error in set_favorite command: {e}")
await interaction.edit_original_response(
content="❌ An unexpected error occurred while adding the favorite."
)

@bot.tree.command(
name='play-favorite',
description="Play a favorite radio station by number"
)
@discord.app_commands.checks.cooldown(rate=1, per=5)
@is_channel()
async def play_favorite(interaction: discord.Interaction, number: int):
try:
favorites_manager = get_favorites_manager()
favorite = favorites_manager.get_favorite_by_number(interaction.guild.id, number)

if not favorite:
await interaction.response.send_message(f"❌ Favorite #{number} not found.", ephemeral=True)
return

await interaction.response.send_message(
f"🎵 Starting favorite #{number}: **{favorite['station_name']}**"
)
await play_stream(interaction, favorite['stream_url'])

except Exception as e:
logger.error(f"Error in play_favorite command: {e}")
if interaction.response.is_done():
await interaction.followup.send("❌ An error occurred while playing the favorite.", ephemeral=True)
else:
await interaction.response.send_message("❌ An error occurred while playing the favorite.", ephemeral=True)

@bot.tree.command(
name='favorites',
description="Show favorites with clickable buttons"
)
@discord.app_commands.checks.cooldown(rate=1, per=10)
@is_channel()
async def favorites(interaction: discord.Interaction):
try:
favorites_manager = get_favorites_manager()
favorites_list = favorites_manager.get_favorites(interaction.guild.id)

if not favorites_list:
await interaction.response.send_message(
"📻 No favorites set for this server yet! Use `/set-favorite` to add some.",
ephemeral=True
)
return

# Create embed and view with buttons
embed = create_favorites_embed(favorites_list, 0, interaction.guild.name)
view = FavoritesView(favorites_list, 0)

await interaction.response.send_message(embed=embed, view=view)

except Exception as e:
logger.error(f"Error in favorites command: {e}")
await interaction.response.send_message("❌ An error occurred while loading favorites.", ephemeral=True)

@bot.tree.command(
name='list-favorites',
description="List all favorites (text only, mobile-friendly)"
)
@discord.app_commands.checks.cooldown(rate=1, per=5)
@is_channel()
async def list_favorites(interaction: discord.Interaction):
try:
favorites_manager = get_favorites_manager()
favorites_list = favorites_manager.get_favorites(interaction.guild.id)

embed = create_favorites_list_embed(favorites_list, interaction.guild.name)
await interaction.response.send_message(embed=embed)

except Exception as e:
logger.error(f"Error in list_favorites command: {e}")
await interaction.response.send_message("❌ An error occurred while listing favorites.", ephemeral=True)

@bot.tree.command(
name='remove-favorite',
description="Remove a favorite radio station"
)
@discord.app_commands.checks.cooldown(rate=1, per=5)
@is_channel()
async def remove_favorite(interaction: discord.Interaction, number: int):
# Check permissions
perm_manager = get_permission_manager()
if not perm_manager.can_remove_favorites(interaction.guild.id, interaction.user):
await interaction.response.send_message(
"❌ You don't have permission to remove favorites. Ask an admin to assign you the appropriate role.",
ephemeral=True
)
return

try:
favorites_manager = get_favorites_manager()

# Check if favorite exists first
favorite = favorites_manager.get_favorite_by_number(interaction.guild.id, number)
if not favorite:
await interaction.response.send_message(f"❌ Favorite #{number} not found.", ephemeral=True)
return

# Create confirmation view
view = ConfirmationView("remove", f"favorite #{number}: {favorite['station_name']}")
await interaction.response.send_message(
f"⚠️ Are you sure you want to remove favorite #{number}: **{favorite['station_name']}**?\n"
f"This will reorder all subsequent favorites.",
view=view
)

# Wait for confirmation
await view.wait()

if view.confirmed:
result = favorites_manager.remove_favorite(interaction.guild.id, number)
if result['success']:
await interaction.followup.send(
f"✅ Removed **{result['station_name']}** from favorites. Subsequent favorites have been renumbered."
)
else:
await interaction.followup.send(f"❌ Failed to remove favorite: {result['error']}")

except Exception as e:
logger.error(f"Error in remove_favorite command: {e}")
if interaction.response.is_done():
await interaction.followup.send("❌ An error occurred while removing the favorite.", ephemeral=True)
else:
await interaction.response.send_message("❌ An error occurred while removing the favorite.", ephemeral=True)

@bot.tree.command(
name='setup-roles',
description="Configure which Discord roles can manage favorites"
)
@discord.app_commands.checks.cooldown(rate=1, per=5)
@is_channel()
async def setup_roles(interaction: discord.Interaction, role: discord.Role = None, permission_level: str = None):
# Check permissions
perm_manager = get_permission_manager()
if not perm_manager.can_manage_roles(interaction.guild.id, interaction.user):
await interaction.response.send_message(
"❌ You don't have permission to manage role assignments. Ask an admin to assign you the appropriate role.",
ephemeral=True
)
return

try:
# If no parameters provided, show current setup
if not role and not permission_level:
role_assignments = perm_manager.get_server_role_assignments(interaction.guild.id)
available_roles = perm_manager.get_available_permission_roles()

embed = create_role_setup_embed(role_assignments, available_roles, interaction.guild.name)
await interaction.response.send_message(embed=embed)
return

# Both parameters required for assignment
if not role or not permission_level:
await interaction.response.send_message(
"❌ Please provide both a role and permission level.\n"
"Example: `/setup-roles @DJ dj`\n"
"Available levels: user, dj, radio manager, admin",
ephemeral=True
)
return

# Validate permission level
available_roles = perm_manager.get_available_permission_roles()
valid_levels = [r['role_name'] for r in available_roles]

if permission_level.lower() not in valid_levels:
await interaction.response.send_message(
f"❌ Invalid permission level. Available levels: {', '.join(valid_levels)}",
ephemeral=True
)
return

# Assign the role
success = perm_manager.assign_role_permission(
guild_id=interaction.guild.id,
role_id=role.id,
role_name=permission_level.lower()
)

if success:
await interaction.response.send_message(
f"✅ Assigned role {role.mention} to permission level **{permission_level}**"
)
else:
await interaction.response.send_message(
"❌ Failed to assign role permission. Please check the permission level is valid.",
ephemeral=True
)

except Exception as e:
logger.error(f"Error in setup_roles command: {e}")
if interaction.response.is_done():
await interaction.followup.send("❌ An error occurred while setting up roles.", ephemeral=True)
else:
await interaction.response.send_message("❌ An error occurred while setting up roles.", ephemeral=True)

### END FAVORITES COMMANDS ###

@bot.tree.error
async def on_command_error(interaction: discord.Interaction, error):
original_error = error.original if hasattr(error, 'original') else error
Expand Down
Loading
Loading