Refactored into service directory

service/.env.TEMPLATE

@@ -1,4 +1,5 @@
 RUST_LOG=warn,siren=info
+COMPOSE_PROJECT_NAME=siren
 
 DATABASE_USER=siren
 DATABASE_PASSWORD=

service/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.8'
 
 services:
   siren:
@@ -18,6 +18,9 @@ services:
       SERVICE_PORT: 5000
     depends_on:
       - db
+    networks:
+      - frontend
+      - backend
     restart: unless-stopped
   db:
     image: postgres:latest
@@ -33,8 +36,14 @@ services:
       - db_logs:/var/log
     ports:
       - ${DATABASE_PORT:-5432}:5432
+    networks:
+      - backend
     restart: unless-stopped
 
 volumes:
   db:
   db_logs:
+
+networks:
+  frontend:
+  backend:

src/commands/audio/mod.rs

@@ -1,190 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use log::debug;
-
-use serenity::model::application::interaction::{InteractionResponseType, application_command::ApplicationCommandInteraction};
-use serenity::model::prelude::{GuildId, ChannelId};
-use serenity::model::user::User;
-use serenity::prelude::*;
-use songbird::{Call, Songbird};
-use songbird::input::{Restartable, Input, Metadata, error::Error as SongbirdError};
-
-pub mod pause;
-pub mod play;
-pub mod resume;
-pub mod skip;
-pub mod stop;
-pub mod volume;
-
-#[derive(Clone, Debug)]
-pub struct AudioConfigs;
-
-impl TypeMapKey for AudioConfigs {
-  type Value = Arc<RwLock<HashMap<GuildId, AudioConfig>>>;
-}
-
-#[derive(Clone, Debug)]
-pub struct AudioConfig {
-  pub volume: f32
-}
-
-/// Joins a Discord voice channel.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// - guild_id_option - The guild ID of the guild to join.
-/// - user - The user that is requesting to join the voice channel.
-/// 
-/// # Returns
-/// Result<(), String> - Ok if the bot successfully joined the voice channel, Err if there was an error.
-pub async fn join(ctx: &Context, guild_id_option: &Option<GuildId>, user: &User) -> Result<(), String> {
-  let guild_id = match guild_id_option {
-    Some(g) => g,
-    None => {
-      return Err(format!("{}", "No guild ID set"));
-    }
-  };
-
-  let channel_id = match find_voice_channel(&ctx, &guild_id, &user) {
-    Ok(channel) => channel,
-    Err(err) => return Err(format!("{}", err))
-  };
-
-  debug!("<{}> Joining channel {}", guild_id.0, channel_id);
-  let manager = get_songbird(ctx).await;
-  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))
-  }
-}
-
-/// Leaves a Discord voice channel.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// - guild_id_option - The guild ID of the guild to leave.
-/// 
-/// # Returns
-/// Result<(), String> - Ok if the bot successfully left the voice channel, Err if there was an error.
-pub async fn leave(ctx: &Context, guild_id_option: &Option<GuildId>) -> Result<(), String> {
-  let guild_id = match guild_id_option {
-    Some(g) => g,
-    None => {
-      return Err(format!("{}", "No guild ID set"));
-    }
-  };
-
-  let manager = get_songbird(ctx).await;
-  if manager.get(*guild_id).is_some() {
-    debug!("<{}> Disconnecting from channel", guild_id.0);
-    if let Err(e) = manager.remove(*guild_id).await {
-      return Err(format!("{}", e))
-    }
-  }
-  Ok(())
-}
-
-/// Finds the voice channel that the user is in.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// - guild_id - The guild ID of the guild to search.
-/// - user - The user to search for.
-/// 
-/// # Returns
-/// Result<ChannelId, String> - Ok if the user is in a voice channel, Err if the user is not in a voice channel.
-fn find_voice_channel(ctx: &Context, guild_id: &GuildId, user: &User) -> Result<ChannelId, String> {
-  let guild = match guild_id.to_guild_cached(ctx.cache.to_owned()) {
-    Some(g) => g,
-    None => return Err(format!("Guild not found"))
-  };
-
-  match guild.voice_states.get(&user.id).and_then(|voice_state| voice_state.channel_id) {
-    Some(channel) => Ok(channel),
-    None => return Err(format!("User is not in a voice channel"))
-  }
-}
-
-/// Creates a response to an interaction.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// - command - The command that was sent.
-/// - content - The content of the response.
-/// 
-/// # Returns
-/// Result<(), SerenityError> - Ok if the response was created successfully, Err if there was an error.
-pub async fn create_response(ctx: &Context, command: &ApplicationCommandInteraction, content: String) -> Result<(), SerenityError> {
-  command.create_interaction_response(&ctx.http, |response: &mut serenity::builder::CreateInteractionResponse<'_>| {
-    response
-      .kind(InteractionResponseType::ChannelMessageWithSource)
-      .interaction_response_data(|message: &mut serenity::builder::CreateInteractionResponseData<'_>| message.content(content))
-  }).await
-}
-
-/// Edits a response to an interaction.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// - command - The command that was sent.
-/// - content - The content of the response.
-/// 
-/// # Returns
-/// Result<Message, SerenityError> - Ok if the response was edited successfully, Err if there was an error.
-pub async fn edit_response(ctx: &Context, command: &ApplicationCommandInteraction, content: String) -> Result<serenity::model::channel::Message, SerenityError> {
-  command.edit_original_interaction_response(&ctx.http, |response: &mut serenity::builder::EditInteractionResponse| {
-    response.content(content)
-  }).await
-}
-
-/// Adds a song to the queue.
-/// 
-/// # Arguments
-/// - call - The call to add the song to.
-/// - url - The URL of the song to add.
-/// - lazy - Whether or not to lazy load the song.
-/// 
-/// # Returns
-/// Result<Metadata, SongbirdError> - Ok if the song was added successfully, Err if there was an error.
-pub async fn add_song(call: Arc<Mutex<Call>>, url: &str, lazy: bool, audio_config: Option<&AudioConfig>) -> Result<Metadata, SongbirdError> {
-  let source = if is_valid_url(url) {
-    Restartable::ytdl(url.to_owned(), lazy).await?
-  } else {
-    Restartable::ytdl_search(url, lazy).await?
-  };
-  let mut handler = call.lock().await;
-  let track: Input = source.into();
-  let metadata = *track.metadata.clone();
-  let track_handle = handler.enqueue_source(track);
-  if let Some(ac) = audio_config {
-    let _ = track_handle.set_volume(ac.volume);
-  }
-  Ok(metadata)
-}
-
-/// Checks if a string is a valid URL.
-/// 
-/// # Arguments
-/// - url - The string to check.
-/// 
-/// # Returns
-/// bool - True if the string is a valid URL, false if it is not.
-fn is_valid_url(url: &str) -> bool {
-  match url.parse::<reqwest::Url>() {
-    Ok(_) => return true,
-    Err(_) => return false
-  }
-}
-
-/// Gets the Songbird voice client.
-/// 
-/// # Arguments
-/// - ctx - The context of the command.
-/// 
-/// # Returns
-/// Arc<Songbird> - The Songbird voice client.
-pub async fn get_songbird(ctx: &Context) -> Arc<Songbird> {
-  songbird::get(ctx).await.expect("Songbird Voice client placed in at initialization")
-}

src/commands/audio/pause.rs

@@ -1,43 +0,0 @@
-use log::{debug, error};
-
-use serenity::prelude::*;
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-
-use super::{get_songbird, create_response, edit_response};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  let guild_id = match command.guild_id {
-    Some(g) => g,
-    None => {
-      if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-        error!("Failed to edit response message: {}", why);
-      }
-      return;
-    }
-  };
-  let manager = get_songbird(ctx).await;
-  if let Some(handler_lock) = manager.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    if let Err(err) = handler.queue().pause() {
-      if let Err(why) = edit_response(&ctx, &command, format!("Failed to pause: {}", err)).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    } else {
-      debug!("Paused the track");
-      if let Err(why) = edit_response(&ctx, &command, format!("Pausing the track")).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    }
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("pause").description("Pause the current track")
-}

src/commands/audio/play.rs

@@ -1,134 +0,0 @@
-use log::{debug, warn, error};
-
-use serenity::{prelude::*, async_trait};
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-use songbird::EventHandler;
-
-use crate::commands::audio::{join, leave, add_song, get_songbird, AudioConfigs};
-
-use super::{create_response, edit_response};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Get the track url
-  let track_url = match command.data.options.get(0) {
-    Some(t) => match &t.value {
-      Some(v) => match v.as_str() {
-        Some(s) => s.to_owned(),
-        None => {
-          warn!("Missing track option");
-          if let Err(why) = create_response(&ctx, &command, format!("Track option is missing")).await {
-            error!("Failed to create response message: {}", why);
-          }
-          return;
-        }
-      }
-      None => {
-        warn!("Missing track option");
-        if let Err(why) = create_response(&ctx, &command, format!("Track option is missing")).await {
-          error!("Failed to create response message: {}", why);
-        }
-        return;
-      }
-    }
-    None => {
-      warn!("Missing track option");
-      if let Err(why) = create_response(&ctx, &command, format!("Track option is missing")).await {
-        error!("Failed to create response message: {}", why);
-      }
-      return;
-    }
-  };
-
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, format!("Processing command...")).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  match join(&ctx, &command.guild_id, &command.user).await {
-    Ok(_) => {
-      let guild_id = match command.guild_id {
-        Some(g) => g,
-        None => {
-          if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-            error!("Failed to edit response message: {}", why);
-          }
-          return;
-        }
-      };
-      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 audio_config = {
-          let data_read = ctx.data.read().await;
-          data_read.get::<AudioConfigs>().expect("Expected AudioConfigs in TypeMap.").clone()
-        };
-        let ac = audio_config.read().await;
-        match add_song(handler_lock.clone(), &track_url, is_queue_empty, ac.get(&guild_id)).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 })
-          }
-          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(&ctx, &command.guild_id).await {
-              error!("Failed to leave voice channel: {}", why);
-            }
-            return;
-          }
-        };
-      }
-    },
-    Err(err) => {
-      warn!("{}", err);
-      if let Err(why) = edit_response(&ctx, &command, format!("{}", err)).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    }
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("play").description("Plays the given track").create_option(|option| { option
-    .name("track")
-    .description("The track to be played")
-    .kind(serenity::model::prelude::command::CommandOptionType::String)
-    .required(true)
-  })
-}
-
-struct TrackEndNotifier {
-  pub call: std::sync::Arc<songbird::Songbird>,
-  pub guild_id: serenity::model::id::GuildId
-}
-
-#[async_trait]
-impl EventHandler for TrackEndNotifier {
-  async fn act(&self, ctx: &songbird::events::EventContext<'_>) -> Option<songbird::events::Event> {
-    if let songbird::EventContext::Track(_track_list) = ctx {
-      if let Some(call) = self.call.get(self.guild_id) {
-        let mut handler = call.lock().await;
-        if handler.queue().is_empty() {
-          debug!("Queue is empty, leaving voice channel");
-          handler.leave().await.unwrap();
-        }
-      }
-    }
-    None
-  }
-}

src/commands/audio/resume.rs

@@ -1,43 +0,0 @@
-use log::{debug, error};
-
-use serenity::prelude::*;
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-
-use super::{get_songbird, create_response, edit_response};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  let guild_id = match command.guild_id {
-    Some(g) => g,
-    None => {
-      if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-        error!("Failed to edit response message: {}", why);
-      }
-      return;
-    }
-  };
-  let manager = get_songbird(ctx).await;
-  if let Some(handler_lock) = manager.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    if let Err(err) = handler.queue().resume() {
-      if let Err(why) = edit_response(&ctx, &command, format!("Failed to resume: {}", err)).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    } else {
-      debug!("Resumed the track");
-      if let Err(why) = edit_response(&ctx, &command, format!("Resuming the track")).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    }
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("resume").description("Resume the current track")
-}

src/commands/audio/skip.rs

@@ -1,43 +0,0 @@
-use log::{debug, error};
-
-use serenity::prelude::*;
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-
-use super::{get_songbird, create_response, edit_response};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  let guild_id = match command.guild_id {
-    Some(g) => g,
-    None => {
-      if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-        error!("Failed to edit response message: {}", why);
-      }
-      return;
-    }
-  };
-  let manager = get_songbird(ctx).await;
-  if let Some(handler_lock) = manager.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    if let Err(err) = handler.queue().skip() {
-      if let Err(why) = edit_response(&ctx, &command, format!("Failed to skip: {}", err)).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    } else {
-      debug!("Skipped the track");
-      if let Err(why) = edit_response(&ctx, &command, format!("Skipping the track")).await {
-        error!("Failed to edit response message: {}", why);
-      }
-    }
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("skip").description("Skip the current track")
-}

src/commands/audio/stop.rs

@@ -1,38 +0,0 @@
-use log::{debug, error};
-
-use serenity::prelude::*;
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-
-use super::{get_songbird, create_response, edit_response};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  let guild_id = match command.guild_id {
-    Some(g) => g,
-    None => {
-      if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-        error!("Failed to edit response message: {}", why);
-      }
-      return;
-    }
-  };
-  let manager = get_songbird(ctx).await;
-  if let Some(handler_lock) = manager.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    handler.queue().stop();
-    debug!("Stopped the track");
-    if let Err(why) = edit_response(&ctx, &command, format!("Stopping the tracks")).await {
-      error!("Failed to edit response message: {}", why);
-    }
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("stop").description("Stop the current track and clear the queue")
-}

src/commands/audio/volume.rs

@@ -1,85 +0,0 @@
-use log::{error, warn};
-
-use serenity::prelude::*;
-use serenity::builder::CreateApplicationCommand;
-use serenity::model::application::interaction::application_command::ApplicationCommandInteraction;
-
-use super::{get_songbird, create_response, edit_response, AudioConfigs, AudioConfig};
-
-pub async fn run(ctx: &Context, command: &ApplicationCommandInteraction) {
-  // Get the volume
-  let volume = match command.data.options.get(0) {
-    Some(t) => match &t.value {
-      Some(v) => match v.as_i64() {
-        Some(p) => std::cmp::min(100, std::cmp::max(0, p)),
-        None => {
-          warn!("Unable to get volume option as a string");
-          if let Err(why) = create_response(&ctx, &command, format!("Volume option is missing")).await {
-            error!("Failed to create response message: {}", why);
-          }
-          return;
-        }
-      }
-      None => {
-        warn!("Missing volume option value");
-        if let Err(why) = create_response(&ctx, &command, format!("Volume option is missing")).await {
-          error!("Failed to create response message: {}", why);
-        }
-        return;
-      }
-    }
-    None => {
-      warn!("Missing volume option");
-      if let Err(why) = create_response(&ctx, &command, format!("Volume option is missing")).await {
-        error!("Failed to create response message: {}", why);
-      }
-      return;
-    }
-  };
-
-  // Format volume to f32 bound between 0.0 and 1.0
-  let bound_volume = volume as f32 / 100.0;
-
-  // Create the initial response
-  if let Err(why) = create_response(&ctx, &command, "Processing command...".to_string()).await {
-    error!("Failed to create response message: {}", why);
-    return;
-  }
-
-  let guild_id = match command.guild_id {
-    Some(g) => g,
-    None => {
-      if let Err(why) = edit_response(&ctx, &command, "Unable to join voice channel".to_string()).await {
-        error!("Failed to edit response message: {}", why);
-      }
-      return;
-    }
-  };
-  let audio_config_lock = {
-    let data_read = ctx.data.read().await;
-    data_read.get::<AudioConfigs>().expect("Expected AudioConfigs in TypeMap.").clone()
-  };
-  {
-    let mut audio_configs = audio_config_lock.write().await;
-    *audio_configs.entry(guild_id).or_insert(AudioConfig { volume: 1.0 }) = AudioConfig { volume: bound_volume };
-  }
-  let manager = get_songbird(ctx).await;
-  if let Some(handler_lock) = manager.get(guild_id) {
-    let handler = handler_lock.lock().await;
-    for (_, track_handle) in handler.queue().current_queue().iter().enumerate() {
-      let _ = track_handle.set_volume(bound_volume);
-    }
-  }
-  if let Err(why) = edit_response(&ctx, &command, format!("Setting the volume to {}", volume)).await {
-    error!("Failed to set the volume: {}", why);
-  }
-}
-
-pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicationCommand {
-  command.name("volume").description("Set the audio player volume").create_option(|option| { option
-    .name("volume")
-    .description("Volume between 0 and 100")
-    .kind(serenity::model::prelude::command::CommandOptionType::Integer)
-    .required(true)
-  })
-}