diff --git a/service/Dockerfile b/service/Dockerfile index 1bad8a4..c0bbaba 100644 --- a/service/Dockerfile +++ b/service/Dockerfile @@ -17,10 +17,10 @@ RUN cargo build --release FROM debian:bookworm-slim as packages WORKDIR /packages -RUN apt-get update && apt-get install -y curl tar xz-utils ARG TARGETPLATFORM -# Check if the target platform is linux/x86_64, otherwise log error and exit -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + +RUN apt-get update && apt-get install -y curl tar xz-utils && \ + if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ echo "amd64" && false; \ elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \ curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux_armv7l > yt-dlp && \ @@ -53,9 +53,6 @@ USER root COPY --from=builder /builder/target/release/service /usr/local/bin/service COPY --from=packages /packages /usr/bin -RUN apt-get update && apt-get install -y \ - libc6 libc6-dev libopus-dev libpq5 libpq-dev python3-pip ffmpeg - # apt-get auto-remove -y && \ -# RUN pipx install yt-dlp +RUN apt-get update && apt-get install -y libc6 libc6-dev libopus-dev libpq5 libpq-dev python3-pip ffmpeg CMD ["service"] diff --git a/service/migrations/000010_create_guilds/up.sql b/service/migrations/000010_create_guilds/up.sql index 54c825d..b66576f 100644 --- a/service/migrations/000010_create_guilds/up.sql +++ b/service/migrations/000010_create_guilds/up.sql @@ -1,5 +1,4 @@ CREATE TABLE IF NOT EXISTS guilds ( id BIGINT PRIMARY KEY NOT NULL, - name TEXT NOT NULL, - volume INTEGER NOT NULL + volume DOUBLE PRECISION NOT NULL ); \ No newline at end of file diff --git a/service/src/bot/api/routes.rs b/service/src/bot/api/routes.rs index 8e08438..ab5212e 100644 --- a/service/src/bot/api/routes.rs +++ b/service/src/bot/api/routes.rs @@ -6,7 +6,7 @@ use serde::{Serialize, Deserialize}; use serenity::model::prelude::{GuildChannel, ChannelType}; use siren::ServiceError; -use crate::AppState; +use crate::{AppState, bot::commands::audio::{play::play_track, join}}; #[get("/guilds")] async fn get_guilds(data: web::Data>) -> HttpResponse { @@ -109,32 +109,61 @@ async fn send_message(path: web::Path<(String, String)>, text: web::Json, data: web::Data>) -> HttpResponse { - let guild_id = path.into_inner(); +#[derive(Serialize, Deserialize)] +struct PlayRequest { + track_url: String +} + +#[post("/{guild_id}/voice/{channel_id}/play")] +async fn play(path: web::Path<(String, String)>, play_request: web::Json, data: web::Data>) -> HttpResponse { + let (guild_id, channel_id) = path.into_inner(); let guild_id = match guild_id.parse::() { Ok(id) => id, Err(err) => { warn!("Could not parse guild id: {:?}", err); - return ResponseError::error_response(&ServiceError { - status: 422, - message: err.to_string() - }) + return ResponseError::error_response(&ServiceError { status: 422, message: err.to_string() }) + } + }; + let channel_id = match channel_id.parse::() { + Ok(id) => id, + Err(err) => { + warn!("Could not parse channel id: {:?}", err); + return ResponseError::error_response(&ServiceError { status: 422, message: err.to_string() }) + } + }; + let http = Pin::new(&data.http).get_ref(); + let guild = match http.get_guild(guild_id).await { + Ok(guild) => guild, + Err(err) => { + warn!("Could not get guild: {:?}", err); + return ResponseError::error_response(&ServiceError { status: 422, message: err.to_string() }) + } + }; + let channel = match http.get_channel(channel_id).await { + Ok(channel) => channel, + Err(err) => { + warn!("Could not get channel: {:?}", err); + return ResponseError::error_response(&ServiceError { status: 422, message: err.to_string() }) } }; - if let Some(handler_lock) = data.songbird.get(guild_id) { - let handler = handler_lock.lock().await; - if let Err(err) = handler.queue().pause() { - warn!("Could not pause track: {:?}", err); - return ResponseError::error_response(&ServiceError { - status: 422, - message: err.to_string() - }) + let manager = Arc::clone(&data.songbird); + + match join(Arc::clone(&manager), &guild.id, &channel.id()).await { + Ok(_) => { + match play_track(Arc::clone(&data.songbird), guild.id, play_request.track_url.to_string()).await { + Ok(_) => HttpResponse::Ok().finish(), + Err(err) => { + warn!("Could not play track: {:?}", err); + return ResponseError::error_response(&err) + } + } + }, + Err(err) => { + warn!("Could not join channel: {:?}", err); + return ResponseError::error_response(&ServiceError { status: 500, message: err.to_string() }) } } - - HttpResponse::Ok().finish() } #[post("/{guild_id}/voice/pause")] @@ -173,5 +202,6 @@ pub fn init_routes(config: &mut web::ServiceConfig) { .service(get_voice_channels) .service(send_message) .service(pause) + .service(play) ); } \ No newline at end of file diff --git a/service/src/bot/commands/audio/mod.rs b/service/src/bot/commands/audio/mod.rs index 4eaeb76..7d0a793 100644 --- a/service/src/bot/commands/audio/mod.rs +++ b/service/src/bot/commands/audio/mod.rs @@ -1,13 +1,13 @@ -use std::collections::HashMap; use std::sync::Arc; -use log::debug; +use log::{debug, warn}; use serenity::client::Cache; use serenity::model::application::interaction::{InteractionResponseType, application_command::ApplicationCommandInteraction}; use serenity::model::prelude::{GuildId, ChannelId}; use serenity::model::user::User; use serenity::prelude::*; +use siren::ServiceError; use songbird::{Call, Songbird}; use songbird::input::{Restartable, Input, Metadata, error::Error as SongbirdError}; @@ -18,36 +18,29 @@ pub mod skip; pub mod stop; pub mod volume; -#[derive(Clone, Debug)] -pub struct AudioConfigs; - -impl TypeMapKey for AudioConfigs { - type Value = Arc>>; -} - -#[derive(Clone, Debug)] -pub struct AudioConfig { - pub volume: f32 -} - -pub async fn join(cache: &Arc, manager: Arc, guild_id_option: &Option, user: &User) -> Result<(), String> { +pub async fn join_by_user(cache: &Arc, manager: Arc, guild_id_option: &Option, user: &User) -> Result<(), ServiceError> { let guild_id = match guild_id_option { Some(g) => g, - None => { - return Err(format!("{}", "No guild ID set")); - } + None => return Err(ServiceError { status: 422, message: format!("{}", "No guild ID set") }) }; let channel_id = match find_voice_channel(cache, &guild_id, &user) { Ok(channel) => channel, - Err(err) => return Err(format!("{}", err)) + Err(err) => return Err(ServiceError { status: 500, message: err.to_string() }) }; - debug!("<{}> Joining channel {}", guild_id.0, channel_id); + join(manager, guild_id, &channel_id).await +} + +pub async fn join(manager: Arc, guild_id: &GuildId, channel_id: &ChannelId) -> Result<(), ServiceError> { + debug!("<{}> Joining channel {}", guild_id.0, channel_id.0); let (_handle_lock, success) = manager.join(guild_id.to_owned(), channel_id.to_owned()).await; match success { Ok(s) => Ok(s), - Err(err) => Err(format!("{}", err)) + Err(err) => { + warn!("Failed to join channel: {:?}", err); + Err(ServiceError { status: 500, message: err.to_string() }) + } } } diff --git a/service/src/bot/commands/audio/play.rs b/service/src/bot/commands/audio/play.rs index 164b40e..3fb0c7c 100644 --- a/service/src/bot/commands/audio/play.rs +++ b/service/src/bot/commands/audio/play.rs @@ -3,18 +3,16 @@ use std::sync::Arc; use log::{debug, warn, error}; use serenity::model::prelude::GuildId; -use serenity::model::user::User; use serenity::{prelude::*, async_trait}; use serenity::builder::CreateApplicationCommand; use serenity::model::application::interaction::application_command::ApplicationCommandInteraction; use siren::ServiceError; -use songbird::EventHandler; +use songbird::{EventHandler, Songbird}; -use crate::AppState; -use crate::bot::commands::audio::{join, leave, add_song, get_songbird}; +use crate::bot::commands::audio::{leave, add_song, get_songbird}; use crate::db::guilds::QueryGuild; -use super::{create_response, edit_response}; +use super::{create_response, edit_response, join_by_user}; pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) { // Get the track url @@ -54,7 +52,7 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) { } let manager = get_songbird(ctx).await; - match join(&ctx.cache, manager,&command.guild_id, &command.user).await { + match join_by_user(&ctx.cache, manager,&command.guild_id, &command.user).await { Ok(_) => { let guild_id = match command.guild_id { Some(g) => g, @@ -66,37 +64,20 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) { } }; debug!("Play command executed with track: {:?}", track_url); - let manager = get_songbird(ctx).await; - if let Some(handler_lock) = manager.get(guild_id) { - let is_queue_empty = { - let call_handler = handler_lock.lock().await; - call_handler.queue().is_empty() - }; - let guild = QueryGuild::get(guild_id.0 as i64).unwrap(); - match add_song(handler_lock.clone(), &track_url, is_queue_empty, Some(guild.volume)).await { - Ok(added_song) => { - let track_title = added_song.title.unwrap(); - debug!("Added track: {}", track_title); - if let Err(why) = edit_response(&ctx, &command, format!("Added track to queue: {}", track_title)).await { - error!("Failed to edit response message: {}", why); - } - let mut handler = handler_lock.lock().await; - handler.remove_all_global_events(); - handler.add_global_event(songbird::Event::Track(songbird::TrackEvent::End), TrackEndNotifier { guild_id, call: manager }) + match play_track(manager, guild_id, track_url).await { + Ok(_) => { + if let Err(why) = edit_response(&ctx, &command, "Playing track".to_string()).await { + error!("Failed to edit response message: {}", why); } - Err(why) => { - warn!("Failed to add song: {}", why); - if let Err(why) = edit_response(&ctx, &command, format!("Failed to add song: {}", why)).await { - error!("Failed to edit response message: {}", why); - } - if let Err(why) = leave(manager, &command.guild_id).await { - error!("Failed to leave voice channel: {}", why); - } - return; + }, + Err(err) => { + warn!("Failed to play track: {}", err); + if let Err(why) = edit_response(&ctx, &command, format!("Failed to play track: {}", err)).await { + error!("Failed to edit response message: {}", why); } - }; - } + } + }; }, Err(err) => { warn!("{}", err); @@ -107,38 +88,31 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) { } } -pub async fn play(state: Arc, guild_id: Option, user: &User, track_url: String) -> Result<(), ServiceError> { - match join(&state.cache, Arc::clone(&state.songbird), &guild_id, user).await { - Ok(_) => { - let guild_id = match guild_id { - Some(g) => g, - None => { - return Err(ServiceError { - status: 422, - message: "No guild ID set".to_string() - }); - } - }; - if let Some(handler_lock) = state.songbird.get(guild_id) { - let is_queue_empty = { - let call_handler = handler_lock.lock().await; - call_handler.queue().is_empty() - }; - let guild = QueryGuild::get(guild_id.0 as i64)?; - match add_song(handler_lock.clone(), &track_url, is_queue_empty, Some(guild.volume)).await { - Ok(_) => {}, - Err(_) => {} +pub async fn play_track(manager: Arc, guild_id: GuildId, track_url: String) -> Result<(), ServiceError> { + if let Some(handler_lock) = manager.get(guild_id) { + let is_queue_empty = { + let call_handler = handler_lock.lock().await; + call_handler.queue().is_empty() + }; + let guild = QueryGuild::get(guild_id.0 as i64)?; + match add_song(handler_lock.clone(), &track_url, is_queue_empty, Some(guild.volume as f32)).await { + Ok(added_song) => { + let track_title = added_song.title.unwrap(); + debug!("Added track: {}", track_title); + let mut handler = handler_lock.lock().await; + handler.remove_all_global_events(); + handler.add_global_event(songbird::Event::Track(songbird::TrackEvent::End), TrackEndNotifier { guild_id, call: manager }) + }, + Err(err) => { + warn!("Failed to add song: {}", err); + if let Err(why) = leave(manager, &Some(guild_id)).await { + error!("Failed to leave voice channel: {}", why); } + return Err(ServiceError { status: 422, message: err.to_string() }) } - Ok(()) - }, - Err(err) => { - return Err(ServiceError { - status: 422, - message: err.to_string() - }); } } + Ok(()) } pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand { diff --git a/service/src/bot/commands/audio/volume.rs b/service/src/bot/commands/audio/volume.rs index a8cf258..51fa174 100644 --- a/service/src/bot/commands/audio/volume.rs +++ b/service/src/bot/commands/audio/volume.rs @@ -57,7 +57,7 @@ pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) { return; } }; - let _ = InsertGuild::update_audio(guild_id.0 as i64, bound_volume); + let _ = InsertGuild::update_audio(guild_id.0 as i64, bound_volume as f64); let manager = get_songbird(ctx).await; if let Some(handler_lock) = manager.get(guild_id) { let handler = handler_lock.lock().await; diff --git a/service/src/bot/handler.rs b/service/src/bot/handler.rs index 848ebdb..c0bbd0d 100644 --- a/service/src/bot/handler.rs +++ b/service/src/bot/handler.rs @@ -74,7 +74,7 @@ impl EventHandler for Handler { warn!("No ready guilds found"); } for guild in ready.guilds { - let _ = InsertGuild::insert(InsertGuild { id: (guild.id.0 as i64), name: "".to_string(), volume: 100.0 }); + let _ = InsertGuild::insert(InsertGuild { id: (guild.id.0 as i64), volume: 100.0 }); let commands = guild.id.set_application_commands(&ctx.http, |commands| { commands.create_application_command(|command: &mut serenity::builder::CreateApplicationCommand| { commands::ping::register(command) }) .create_application_command(|command: &mut serenity::builder::CreateApplicationCommand| { commands::audio::play::register(command) }) diff --git a/service/src/db/guilds/model.rs b/service/src/db/guilds/model.rs index 4017cab..ccc6904 100644 --- a/service/src/db/guilds/model.rs +++ b/service/src/db/guilds/model.rs @@ -8,8 +8,7 @@ use crate::db::{schema::guilds, connection}; #[diesel(table_name = guilds)] pub struct QueryGuild { pub id: i64, - pub name: String, - pub volume: f32 + pub volume: f64 } impl QueryGuild { @@ -24,8 +23,7 @@ impl QueryGuild { #[diesel(table_name = guilds)] pub struct InsertGuild { pub id: i64, - pub name: String, - pub volume: f32 + pub volume: f64 } impl InsertGuild { @@ -35,7 +33,7 @@ impl InsertGuild { Ok(guild) } - pub fn update_audio(id: i64, volume: f32) -> Result { + pub fn update_audio(id: i64, volume: f64) -> Result { let mut conn = connection()?; let guild = diesel::update(guilds::table.filter(guilds::id.eq(id))).set(guilds::volume.eq(volume)).get_result(&mut conn)?; Ok(guild) diff --git a/service/src/db/schema.rs b/service/src/db/schema.rs index 2564bdc..290464b 100644 --- a/service/src/db/schema.rs +++ b/service/src/db/schema.rs @@ -34,7 +34,6 @@ diesel::table! { diesel::table! { guilds (id) { id -> BigInt, - name -> Text, - volume -> Float, + volume -> Float8, } } \ No newline at end of file