jojara/JellyfinDiscordBot
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes to how disconnecting and data works

Browse Source
This commit is contained in:
Jellyfishsh 2025-04-18 19:43:47 -07:00
parent 3d73b06b12
commit 7a70bc2c23
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bot.py
View File

@ -3,7 +3,7 @@ import os
import requests import requests
import discord import discord
from discord.ext import commands from discord.ext import commands
from discord import NotFound, app_commands from discord import DiscordException, NotFound, app_commands
from dotenv import load_dotenv from dotenv import load_dotenv
@ -103,18 +103,23 @@ async def play(interaction: discord.Interaction, title: str):
voice_client = interaction.guild.voice_client # Enables the voice feature for the bot voice_client = interaction.guild.voice_client # Enables the voice feature for the bot
# If its not connected to a voice channel, then connect to the channel that the caller is in # If its not connected to a voice channel, then connect to the channel that the caller is in
if voice_client is None: if voice_client is None:
voice_client = await channel.connect() voice_client = await user_channel.connect()
# If the caller is in a channel that its not already in, move there # If the caller is in a channel that its not already in, move there
elif voice_client.channel != channel: elif voice_client.channel != user_channel:
await voice_client.move_to(channel) await voice_client.move_to(user_channel)
voice_client = await channel.connect() voice_client = await user_channel.connect()
#Pause the music that is currently playing #Pause the music that is currently playing
if voice_client.is_playing(): if voice_client.is_playing():
voice_client.stop() voice_client.stop()
except NotFound as e: except discord.errors.NotFound as e:
await interaction.response.send_message("You must be in a voice channel.") print(f"Error: {e}")
await interaction.followup.send("Nope! Not in a voice!")
return
except discord.errors.Forbidden as e:
print(f"Error: {e}")
await interaction.followup.send("Not allowed in here!")
return return
@ -191,21 +196,37 @@ async def search(interaction: discord.Interaction, title: str):
# Get the data # Get the data
data = await make_request(url, params, interaction) data = await make_request(url, params, interaction)
await interaction.followup.send("stuff")
print(data)
return
if not data: if not data:
await interaction.followup.send(f"No song found matching `{title}`.") await interaction.followup.send(f"No song found matching `{title}`.")
return return
songs = data.get("Items", []) songs = data.get("Items", [])
lines = [] lines = []
print(data.get("Items", []))
return
for song in songs: # for song in songs:
title = song.get("Name") # title = song.get("Title")
artist = song.get("AlbumArtist", ["Unknown Artist"]) # artist = song.get("AlbumArtist", ["Unknown Artist"])
lines.append(f"**{title}** by *{artist}*") # lines.append(f"**{title}** by *{artist}*")
await interaction.followup.send("\n".join(lines)) # await interaction.followup.send("\n".join(lines))
# end search ----- # end search -----
# Disconnect command!
# Disconnects from the voice channel
@bot.tree.command(name="disconnect", description="Disconnects from current voice channel!")
async def disconnect(interaction: discord.Interaction):
if interaction.guild.voice_client == None:
await interaction.response.send_message("I am not in any voice channel!")
return
await interaction.guild.voice_client.disconnect()