Merge pull request #442 from tktcorporation/feature/271/conflict

✨ feedback a bot conflict message

src/commands/usecase/services/error.rs

@@ -10,6 +10,7 @@ use std::fmt;
 pub enum Error {
     NotInVoiceChannel,
     ErrorSourcingFfmpeg,
+    AlreadyJoined,
     JoinError(JoinError),
     SerenityError(SerenityError),
     TrackError(TrackError),
@@ -20,6 +21,7 @@ impl fmt::Display for Error {
         match self {
             Error::NotInVoiceChannel => f.write_str("Not in a voice channel."),
             Error::ErrorSourcingFfmpeg => f.write_str("Error sourcing ffmpeg."),
+            Error::AlreadyJoined => f.write_str("Already joined. I'm busy!"),
             Error::JoinError(e) => e.fmt(f),
             Error::SerenityError(e) => e.fmt(f),
             Error::TrackError(e) => e.fmt(f),

src/commands/usecase/services/join/service.rs

@@ -23,6 +23,11 @@ pub async fn join(
         .await
         .expect("Songbird Voice client placed in at initialisation.");
 
+    let has_handler = manager.get(guild.id).is_some();
+    if has_handler {
+        return Err(Error::AlreadyJoined);
+    }
+
     // voice settings
     let client = config::client::new(crate::infrastructure::GuildPath::new(&guild.id));
     client.write(config::Config { speech_options });
@@ -75,6 +80,7 @@ async fn _clear(handle_lock: &std::sync::Arc<serenity::prelude::Mutex<songbird::
 
 async fn welcome_audio() -> songbird::input::Input {
     let file_path = SharedSoundPath::new().welcome_audio_path();
+    print!("file_path: {:?}", file_path);
     ffmpeg(file_path)
         .await
         .expect("This might fail: handle this error!")