Fixes

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, bot::commands::audio::{play::play_track, join}, db::guilds::InsertGuild};
+use crate::{AppState, bot::commands::audio::{play::play_track, join}, db::guilds::{InsertGuild, QueryGuild}};
 
 #[get("/guilds")]
 async fn get_guilds(data: web::Data<Arc<AppState>>) -> HttpResponse {
@@ -249,6 +249,34 @@ struct SetVolume {
   volume: String
 }
 
+#[get("/{guild_id}/voice/volume")]
+async fn get_volume(path: web::Path<String>) -> HttpResponse {
+  let guild_id = path.into_inner();
+  let guild_id = match guild_id.parse::<u64>() {
+    Ok(id) => id,
+    Err(err) => {
+      warn!("Could not parse guild id: {:?}", err);
+      return ResponseError::error_response(&ServiceError {
+        status: 422,
+        message: err.to_string()
+      })
+    }
+  };
+
+  let volume = match QueryGuild::get(guild_id as i64) {
+    Ok(guild) => guild.volume,
+    Err(err) => {
+      warn!("Could not get volume: {:?}", err);
+      return ResponseError::error_response(&ServiceError {
+        status: 422,
+        message: err.to_string()
+      })
+    }
+  };
+
+  HttpResponse::Ok().json(volume)
+}
+
 #[post("/{guild_id}/voice/volume")]
 async fn set_volume(path: web::Path<String>, volume: web::Json::<SetVolume>, data: web::Data<Arc<AppState>>) -> HttpResponse {
   let guild_id = path.into_inner();
@@ -277,6 +305,34 @@ async fn set_volume(path: web::Path<String>, volume: web::Json::<SetVolume>, dat
   HttpResponse::Ok().finish()
 }
 
+#[post("/{guild_id}/voice/skip")]
+async fn skip(path: web::Path<String>, data: web::Data<Arc<AppState>>) -> HttpResponse {
+  let guild_id = path.into_inner();
+  let guild_id = match guild_id.parse::<u64>() {
+    Ok(id) => id,
+    Err(err) => {
+      warn!("Could not parse guild id: {:?}", 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().skip() {
+      warn!("Could not skip track: {:?}", err);
+      return ResponseError::error_response(&ServiceError {
+        status: 422,
+        message: err.to_string()
+      })
+    }
+  }
+
+  HttpResponse::Ok().finish()
+}
+
 pub fn init_routes(config: &mut web::ServiceConfig) {
   config
     .service(get_guilds)
@@ -289,5 +345,7 @@ pub fn init_routes(config: &mut web::ServiceConfig) {
       .service(resume)
       .service(pause)
       .service(set_volume)
+      .service(get_volume)
+      .service(skip)
   );
 }

service/src/main.rs

@@ -18,6 +18,7 @@ use crate::bot::{commands::oai::GPTModel, handler::Handler};
 
 use dotenv::dotenv;
 
+mod dnd;
 mod bot;
 mod db;