mirror of
https://github.com/pacnpal/Pac-cogs.git
synced 2025-12-20 02:41:06 -05:00
feat: Implement proper slash commands across all cogs - Use app_commands for better slash command support - Add command and parameter descriptions - Improve interaction handling - Add select menus for better UX
This commit is contained in:
pacnpal
@@ -1,9 +1,10 @@
|
||||
import aiohttp
|
||||
from redbot.core import commands, Config
|
||||
from redbot.core import commands, Config, app_commands
|
||||
from redbot.core.bot import Red
|
||||
import asyncio
|
||||
import json
|
||||
import urllib.parse
|
||||
import discord
|
||||
|
||||
class Overseerr(commands.Cog):
|
||||
def __init__(self, bot: Red):
|
||||
@@ -16,44 +17,50 @@ class Overseerr(commands.Cog):
|
||||
}
|
||||
self.config.register_global(**default_global)
|
||||
|
||||
### GROUP: SETTINGS COMMANDS ###
|
||||
overseerr = app_commands.Group(
|
||||
name="overseerr",
|
||||
description="Overseerr configuration commands",
|
||||
guild_only=True
|
||||
)
|
||||
|
||||
@commands.hybrid_group()
|
||||
@overseerr.command(name="url")
|
||||
@app_commands.guild_only()
|
||||
@app_commands.describe(url="The URL of your Overseerr instance")
|
||||
@commands.admin()
|
||||
async def overseerr(self, ctx: commands.Context):
|
||||
"""Base command group for Overseerr configuration."""
|
||||
if ctx.invoked_subcommand is None:
|
||||
await ctx.send_help()
|
||||
|
||||
@overseerr.command()
|
||||
async def url(self, ctx: commands.Context, url: str):
|
||||
async def set_url(self, interaction: discord.Interaction, url: str):
|
||||
"""Set the Overseerr URL."""
|
||||
url = url.rstrip('/')
|
||||
await self.config.overseerr_url.set(url)
|
||||
await ctx.send(f"Overseerr URL set to: {url}")
|
||||
await interaction.response.send_message(f"Overseerr URL set to: {url}")
|
||||
|
||||
@overseerr.command()
|
||||
async def apikey(self, ctx: commands.Context, api_key: str):
|
||||
@overseerr.command(name="apikey")
|
||||
@app_commands.guild_only()
|
||||
@app_commands.describe(api_key="Your Overseerr API key")
|
||||
@commands.admin()
|
||||
async def set_apikey(self, interaction: discord.Interaction, api_key: str):
|
||||
"""Set the Overseerr API key."""
|
||||
await self.config.overseerr_api_key.set(api_key)
|
||||
await ctx.send("Overseerr API key has been set.")
|
||||
await interaction.response.send_message("Overseerr API key has been set.")
|
||||
|
||||
@overseerr.command()
|
||||
async def adminrole(self, ctx: commands.Context, role_name: str):
|
||||
@overseerr.command(name="adminrole")
|
||||
@app_commands.guild_only()
|
||||
@app_commands.describe(role_name="The name of the admin role")
|
||||
@commands.admin()
|
||||
async def set_adminrole(self, interaction: discord.Interaction, role_name: str):
|
||||
"""Set the admin role name for Overseerr approvals."""
|
||||
await self.config.admin_role_name.set(role_name)
|
||||
await ctx.send(f"Admin role for Overseerr approvals set to: {role_name}")
|
||||
await interaction.response.send_message(f"Admin role for Overseerr approvals set to: {role_name}")
|
||||
|
||||
### REQUEST & APPROVAL COMMANDS ###
|
||||
|
||||
@commands.hybrid_command()
|
||||
async def request(self, ctx: commands.Context, *, query: str):
|
||||
@app_commands.command(name="request")
|
||||
@app_commands.guild_only()
|
||||
@app_commands.describe(query="The name of the movie or TV show to search for")
|
||||
async def request(self, interaction: discord.Interaction, query: str):
|
||||
"""Search and request a movie or TV show on Overseerr."""
|
||||
overseerr_url = await self.config.overseerr_url()
|
||||
overseerr_api_key = await self.config.overseerr_api_key()
|
||||
|
||||
if not overseerr_url or not overseerr_api_key:
|
||||
await ctx.send("Overseerr is not configured. Please ask an admin to set it up using `/overseerr url` and `/overseerr apikey`.")
|
||||
await interaction.response.send_message("Overseerr is not configured. Please ask an admin to set it up using `/overseerr url` and `/overseerr apikey`.", ephemeral=True)
|
||||
return
|
||||
|
||||
search_url = f"{overseerr_url}/api/v1/search"
|
||||
@@ -62,93 +69,117 @@ class Overseerr(commands.Cog):
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
|
||||
# Defer the response since this might take a while
|
||||
await interaction.response.defer()
|
||||
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(search_url, headers=headers, params={"query": query}) as resp:
|
||||
if resp.status != 200:
|
||||
await ctx.send(f"Error from Overseerr API: {resp.status}")
|
||||
await interaction.followup.send(f"Error from Overseerr API: {resp.status}", ephemeral=True)
|
||||
return
|
||||
|
||||
try:
|
||||
search_results = await resp.json()
|
||||
except Exception as e:
|
||||
await ctx.send(f"Failed to parse JSON: {e}")
|
||||
await interaction.followup.send(f"Failed to parse JSON: {e}", ephemeral=True)
|
||||
return
|
||||
|
||||
if 'results' not in search_results:
|
||||
await ctx.send(f"No results found for '{query}'. API Response: {search_results}")
|
||||
await interaction.followup.send(f"No results found for '{query}'. API Response: {search_results}", ephemeral=True)
|
||||
return
|
||||
|
||||
if not search_results['results']:
|
||||
await ctx.send(f"No results found for '{query}'.")
|
||||
await interaction.followup.send(f"No results found for '{query}'.", ephemeral=True)
|
||||
return
|
||||
|
||||
# Display search results with availability status
|
||||
result_message = "Please choose a result by reacting with the corresponding number:\n\n"
|
||||
for i, result in enumerate(search_results['results'][:5], start=1):
|
||||
# Create select menu for results
|
||||
options = []
|
||||
for i, result in enumerate(search_results['results'][:25]): # Discord limit is 25 options
|
||||
media_type = result['mediaType']
|
||||
title = result['title']
|
||||
release_date = result.get('releaseDate', 'N/A')
|
||||
status = await self.get_media_status(result['id'], media_type)
|
||||
result_message += f"{i}. [{media_type.upper()}] {title} ({release_date}) - {status}\n"
|
||||
|
||||
# Truncate description if needed (Discord has a 100-character limit for option descriptions)
|
||||
description = f"[{media_type.upper()}] ({release_date}) - {status}"
|
||||
if len(description) > 100:
|
||||
description = description[:97] + "..."
|
||||
|
||||
options.append(
|
||||
discord.SelectOption(
|
||||
label=title[:100], # Discord has a 100-character limit for labels
|
||||
description=description,
|
||||
value=str(i)
|
||||
)
|
||||
)
|
||||
|
||||
result_msg = await ctx.send(result_message)
|
||||
select = discord.ui.Select(
|
||||
placeholder="Choose a title to request...",
|
||||
options=options,
|
||||
custom_id="media_select"
|
||||
)
|
||||
|
||||
# Add reaction options
|
||||
reactions = ['1️⃣', '2️⃣', '3️⃣', '4️⃣', '5️⃣']
|
||||
for i in range(min(len(search_results['results']), 5)):
|
||||
await result_msg.add_reaction(reactions[i])
|
||||
async def select_callback(select_interaction: discord.Interaction):
|
||||
selected_index = int(select_interaction.data['values'][0])
|
||||
selected_result = search_results['results'][selected_index]
|
||||
media_type = selected_result['mediaType']
|
||||
|
||||
def check(reaction, user):
|
||||
return user == ctx.author and str(reaction.emoji) in reactions
|
||||
# Check if the media is already available or requested
|
||||
status = await self.get_media_status(selected_result['id'], media_type)
|
||||
if "Available" in status:
|
||||
await select_interaction.response.send_message(
|
||||
f"'{selected_result['title']}' is already available. No need to request!",
|
||||
ephemeral=True
|
||||
)
|
||||
return
|
||||
elif "Requested" in status:
|
||||
await select_interaction.response.send_message(
|
||||
f"'{selected_result['title']}' has already been requested. No need to request again!",
|
||||
ephemeral=True
|
||||
)
|
||||
return
|
||||
|
||||
try:
|
||||
reaction, user = await self.bot.wait_for('reaction_add', timeout=60.0, check=check)
|
||||
except asyncio.TimeoutError:
|
||||
await ctx.send("Search timed out. Please try again.")
|
||||
return
|
||||
# Make the request
|
||||
request_url = f"{overseerr_url}/api/v1/request"
|
||||
request_data = {
|
||||
"mediaId": selected_result['id'],
|
||||
"mediaType": media_type
|
||||
}
|
||||
|
||||
selected_index = reactions.index(str(reaction.emoji))
|
||||
selected_result = search_results['results'][selected_index]
|
||||
media_type = selected_result['mediaType']
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.post(request_url, headers=headers, json=request_data) as resp:
|
||||
if resp.status == 200:
|
||||
response_data = await resp.json()
|
||||
request_id = response_data.get('id')
|
||||
await select_interaction.response.send_message(
|
||||
f"Successfully requested {media_type} '{selected_result['title']}'! Request ID: {request_id}"
|
||||
)
|
||||
else:
|
||||
await select_interaction.response.send_message(
|
||||
f"Failed to request {media_type} '{selected_result['title']}'. Please try again later.",
|
||||
ephemeral=True
|
||||
)
|
||||
|
||||
# Check if the media is already available or requested
|
||||
status = await self.get_media_status(selected_result['id'], media_type)
|
||||
if "Available" in status:
|
||||
await ctx.send(f"'{selected_result['title']}' is already available. No need to request!")
|
||||
return
|
||||
elif "Requested" in status:
|
||||
await ctx.send(f"'{selected_result['title']}' has already been requested. No need to request again!")
|
||||
return
|
||||
select.callback = select_callback
|
||||
view = discord.ui.View()
|
||||
view.add_item(select)
|
||||
await interaction.followup.send("Search results:", view=view)
|
||||
|
||||
# Make the request
|
||||
request_url = f"{overseerr_url}/api/v1/request"
|
||||
request_data = {
|
||||
"mediaId": selected_result['id'],
|
||||
"mediaType": media_type
|
||||
}
|
||||
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.post(request_url, headers=headers, json=request_data) as resp:
|
||||
if resp.status == 200:
|
||||
response_data = await resp.json()
|
||||
request_id = response_data.get('id')
|
||||
await ctx.send(f"Successfully requested {media_type} '{selected_result['title']}'! Request ID: {request_id}")
|
||||
else:
|
||||
await ctx.send(f"Failed to request {media_type} '{selected_result['title']}'. Please try again later.")
|
||||
|
||||
@commands.hybrid_command()
|
||||
async def approve(self, ctx: commands.Context, request_id: int):
|
||||
@app_commands.command(name="approve")
|
||||
@app_commands.guild_only()
|
||||
@app_commands.describe(request_id="The ID of the request to approve")
|
||||
async def approve(self, interaction: discord.Interaction, request_id: int):
|
||||
"""Approve a request on Overseerr."""
|
||||
admin_role_name = await self.config.admin_role_name()
|
||||
if not any(role.name == admin_role_name for role in ctx.author.roles):
|
||||
await ctx.send(f"You need the '{admin_role_name}' role to approve requests.")
|
||||
if not any(role.name == admin_role_name for role in interaction.user.roles):
|
||||
await interaction.response.send_message(f"You need the '{admin_role_name}' role to approve requests.", ephemeral=True)
|
||||
return
|
||||
|
||||
overseerr_url = await self.config.overseerr_url()
|
||||
overseerr_api_key = await self.config.overseerr_api_key()
|
||||
|
||||
if not overseerr_url or not overseerr_api_key:
|
||||
await ctx.send("Overseerr is not configured. Please ask an admin to set it up using `/overseerr url` and `/overseerr apikey`.")
|
||||
await interaction.response.send_message("Overseerr is not configured. Please ask an admin to set it up using `/overseerr url` and `/overseerr apikey`.", ephemeral=True)
|
||||
return
|
||||
|
||||
approve_url = f"{overseerr_url}/api/v1/request/{request_id}/approve"
|
||||
@@ -160,12 +191,10 @@ class Overseerr(commands.Cog):
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.post(approve_url, headers=headers) as resp:
|
||||
if resp.status == 200:
|
||||
await ctx.send(f"Request {request_id} has been approved!")
|
||||
await interaction.response.send_message(f"Request {request_id} has been approved!")
|
||||
else:
|
||||
await ctx.send(f"Failed to approve request {request_id}. Please check the request ID and try again.")
|
||||
await interaction.response.send_message(f"Failed to approve request {request_id}. Please check the request ID and try again.", ephemeral=True)
|
||||
|
||||
### HELPER FUNCTION TO CHECK MEDIA STATUS ###
|
||||
|
||||
async def get_media_status(self, media_id, media_type):
|
||||
overseerr_url = await self.config.overseerr_url()
|
||||
overseerr_api_key = await self.config.overseerr_api_key()
|
||||
|
||||
Reference in New Issue
Block a user