Moved bot api files

service/src/bot/commands/audio/play.rs

@@ -9,8 +9,7 @@ use serenity::model::application::interaction::application_command::ApplicationC
 use siren::ServiceError;
 use songbird::{EventHandler, Songbird};
 
-use crate::bot::commands::audio::{leave, add_song, get_songbird};
-use crate::storage::guilds::QueryGuild;
+use crate::bot::{guilds::QueryGuild, commands::audio::{leave, add_song, get_songbird}};
 
 use super::{create_response, edit_response, join_by_user};
 

service/src/bot/commands/audio/volume.rs

@@ -7,7 +7,7 @@ use serenity::builder::CreateApplicationCommand;
 use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
 use songbird::Songbird;
 
-use crate::storage::guilds::InsertGuild;
+use crate::bot::guilds::InsertGuild;
 
 use super::{get_songbird, create_response, edit_response};
 

service/src/bot/guilds/routes.rs

@@ -1,18 +1,16 @@
 use std::{sync::Arc, pin::Pin};
 
 use actix_web::{get, post, web, HttpResponse, ResponseError};
-use log::warn;
 use serde::{Serialize, Deserialize};
 use serenity::model::prelude::{GuildChannel, ChannelType};
 use siren::{ServiceError, Response};
 
-use crate::{AppState, bot::commands::audio::{play::play_track, join}, storage::guilds::QueryGuild, auth::{JwtAuth, verify_role}};
+use crate::{AppState, bot::commands::audio::{play::play_track, join}, bot::guilds::QueryGuild, auth::{JwtAuth, verify_role}};
 
 #[get("/guilds")]
 async fn get_guilds(data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_results = &data.http.get_guilds(None, None).await;
   let guilds = match guild_results {
@@ -30,9 +28,8 @@ async fn get_guilds(data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpRespon
 
 #[get("/{id}/text")]
 async fn get_text_channels(id: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let channel_results = &data.http.get_channels(id.parse::<u64>().unwrap()).await;
   let channels = match channel_results {
@@ -50,9 +47,8 @@ async fn get_text_channels(id: web::Path<String>, data: web::Data<Arc<AppState>>
 
 #[get("/{id}/voice")]
 async fn get_voice_channels(id: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let channel_results = &data.http.get_channels(id.parse::<u64>().unwrap()).await;
   let channels = match channel_results {
@@ -75,9 +71,8 @@ struct ChannelMessage {
 
 #[post("/{guild_id}/text/{channel_id}/message")]
 async fn send_message(path: web::Path<(String, String)>, text: web::Json<ChannelMessage>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let (guild_id, channel_id) = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -136,9 +131,8 @@ struct PlayRequest {
 
 #[post("/{guild_id}/voice/{channel_id}/play")]
 async fn play(path: web::Path<(String, String)>, play_request: web::Json<PlayRequest>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let (guild_id, channel_id) = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -186,9 +180,8 @@ async fn play(path: web::Path<(String, String)>, play_request: web::Json<PlayReq
 
 #[post("/{guild_id}/voice/stop")]
 async fn stop(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -211,9 +204,8 @@ async fn stop(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: Jwt
 
 #[post("/{guild_id}/voice/resume")]
 async fn resume(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -241,9 +233,8 @@ async fn resume(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: J
 
 #[post("/{guild_id}/voice/pause")]
 async fn pause(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -276,9 +267,8 @@ struct SetVolume {
 
 #[get("/{guild_id}/voice/volume")]
 async fn get_volume(path: web::Path<String>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -306,9 +296,8 @@ async fn get_volume(path: web::Path<String>, auth: JwtAuth) -> HttpResponse {
 
 #[post("/{guild_id}/voice/volume")]
 async fn set_volume(path: web::Path<String>, volume: web::Json::<SetVolume>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {
@@ -337,9 +326,8 @@ async fn set_volume(path: web::Path<String>, volume: web::Json::<SetVolume>, dat
 
 #[post("/{guild_id}/voice/skip")]
 async fn skip(path: web::Path<String>, data: web::Data<Arc<AppState>>, auth: JwtAuth) -> HttpResponse {
-  let _ = match verify_role(&auth, "admin") {
-    Ok(_) => {},
-    Err(err) => return ResponseError::error_response(&err)
+  if let Err(err) = verify_role(&auth, "admin") {
+    return ResponseError::error_response(&err)
   };
   let guild_id = path.into_inner();
   let guild_id = match guild_id.parse::<u64>() {

service/src/bot/handler.rs

@@ -5,7 +5,7 @@ use serenity::model::gateway::Ready;
 use serenity::model::channel::Message;
 use serenity::prelude::*;
 
-use crate::storage::guilds::InsertGuild;
+use crate::bot::guilds::InsertGuild;
 
 use super::commands;
 use super::commands::audio::create_response;

service/src/bot/messages/routes.rs

@@ -3,7 +3,7 @@ use log::error;
 use serde::{Serialize, Deserialize};
 use siren::{Response, Metadata, ServiceError};
 
-use crate::{storage::messages::{QueryMessage, QueryFilters, InsertMessage}, auth::{JwtAuth, verify_role}};
+use crate::{bot::messages::{QueryMessage, QueryFilters, InsertMessage}, auth::{JwtAuth, verify_role}};
 
 #[derive(Serialize, Deserialize)]
 struct GetAllParams {

service/src/bot/mod.rs

@@ -1,3 +1,4 @@
-pub mod api;
 pub mod commands;
+pub mod guilds;
 pub mod handler;
+pub mod messages;

service/src/main.rs

@@ -122,11 +122,11 @@ async fn main() -> std::io::Result<()> {
     App::new()
       .wrap(cors)
       .app_data(web::Data::new(Arc::clone(&app_data)))
-      .configure(crate::storage::messages::init_routes)
       .configure(crate::auth::init_routes)
       .configure(crate::users::init_routes)
       .configure(crate::dnd::spells::init_routes)
-      .configure(crate::bot::api::init_routes)
+      .configure(crate::bot::guilds::init_routes)
+      .configure(crate::bot::messages::init_routes)
   })
   .bind(format!("{}:{}", host, port)) {
     Ok(b) => {

service/src/storage/guilds/mod.rs

@@ -1,3 +0,0 @@
-mod model;
-
-pub use model::*;

service/src/storage/mod.rs

@@ -8,8 +8,6 @@ use log::{error, info};
 use r2d2;
 use std::env;
 
-pub mod guilds;
-pub mod messages;
 pub mod schema;
 
 type DbPool = r2d2::Pool<DieselConnectionManager<PgConnection>>;