disable arm target

.gitea/workflows/deploy.yaml

@@ -5,9 +5,6 @@ on:
     branches:
       - main
 
-paths-ignore:
-- 'README.md'
-
 jobs:
   release-image:
     runs-on: ubuntu-latest
@@ -29,5 +26,6 @@ jobs:
         with:
           platforms: |
             linux/amd64
+            # linux/arm64
           push: true
           tags: jheuel/ohrwurm:latest

Cargo.toml

@@ -23,7 +23,7 @@ twilight-util = { version = "0.15", features=["builder"] }
 dotenv = "0.15.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-url = "2.5.1"
+url = "2.5.0"
 anyhow = "1.0.86"
 dashmap = "5.5.3"
 async-trait = "0.1.80"

README.md

@@ -8,7 +8,7 @@
 Ohrwurm is a user-friendly bot designed to play music in Discord voice chats. Once added to your server, you can request a song using the command `/play {query}`, where query can be a URL to a YouTube video or playlist, or a simple search term. The bot will fetch the song and start playing it. You can pause the music with `/pause`, resume playback with `/resume`, and stop and clear the queue with `/stop`. If the bot is alone in a voice chat, it will automatically leave, but you can also manually make it leave with the `/leave` command.
 
 # Deployment
-To deploy Ohrwurm with Docker, you can use the [provided Docker image](https://hub.docker.com/r/jheuel/ohrwurm):
+To deploy Ohrwurm with Docker, you can use the [provided Docker](https://hub.docker.com/r/jheuel/ohrwurm) image:
 ```bash
 docker run -d \
   --name ohrwurm \

src/commands/join.rs

@@ -38,9 +38,6 @@ pub(crate) async fn join_channel(
         call.deafen(true).await?;
     }
 
-    // create guild config
-    state.guild_settings.entry(guild_id).or_default();
-
     Ok(())
 }
 

src/commands/leave.rs

@@ -1,56 +1,6 @@
-use crate::state::{State, StateRef};
-use anyhow::Context;
-use std::{error::Error, sync::Arc};
-use twilight_model::{
-    gateway::payload::incoming::InteractionCreate,
-    id::{marker::GuildMarker, Id},
-};
-
-pub(crate) async fn leave_if_alone(
-    guild_id: Id<GuildMarker>,
-    state: State,
-) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
-    let user = state
-        .cache
-        .current_user()
-        .context("Cannot get current user")?;
-    let user_voice_state = state
-        .cache
-        .voice_state(user.id, guild_id)
-        .context("Cannot get voice state")?;
-    let channel = state
-        .cache
-        .channel(user_voice_state.channel_id())
-        .context("Cannot get channel")?;
-    let channel_voice_states = state
-        .cache
-        .voice_channel_states(channel.id)
-        .context("Cannot get voice channel")?;
-    let count = channel_voice_states.count();
-
-    // count is 1 if the bot is the only one in the channel
-    if count == 1 {
-        leave_channel(guild_id, Arc::clone(&state)).await?;
-    }
-    Ok(())
-}
-
-pub(crate) async fn leave_channel(
-    guild_id: Id<GuildMarker>,
-    state: Arc<StateRef>,
-) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
-    // stop playing
-    if let Some(call_lock) = state.songbird.get(guild_id) {
-        let call = call_lock.lock().await;
-        call.queue().stop();
-    }
-    // leave the voice channel
-    state.songbird.leave(guild_id).await?;
-
-    // reset guild settings
-    state.guild_settings.remove(&guild_id);
-    Ok(())
-}
+use crate::state::State;
+use std::error::Error;
+use twilight_model::gateway::payload::incoming::InteractionCreate;
 
 pub(crate) async fn leave(
     interaction: Box<InteractionCreate>,
@@ -66,8 +16,6 @@ pub(crate) async fn leave(
     let Some(guild_id) = interaction.guild_id else {
         return Ok(());
     };
-
-    leave_channel(guild_id, Arc::clone(&state)).await?;
-
+    state.songbird.leave(guild_id).await?;
     Ok(())
 }

src/commands/loop_queue.rs

@@ -1,5 +1,5 @@
 use crate::metadata::MetadataMap;
-use crate::state::{State, StateRef};
+use crate::state::{Settings, State, StateRef};
 use async_trait::async_trait;
 use songbird::{Event, EventContext, EventHandler, TrackEvent};
 use std::ops::Sub;
@@ -29,8 +29,14 @@ pub(crate) async fn loop_queue(
         return Ok(());
     };
 
+    state
+        .guild_settings
+        .entry(guild_id)
+        .or_insert_with(|| Settings { loop_queue: false });
+
     state.guild_settings.entry(guild_id).and_modify(|settings| {
         settings.loop_queue = !settings.loop_queue;
+        println!("loop_queue: {}", settings.loop_queue);
     });
 
     let looping = state

src/commands/mod.rs

@@ -3,7 +3,6 @@ pub(crate) use join::join;
 
 mod leave;
 pub(crate) use leave::leave;
-pub(crate) use leave::leave_if_alone;
 
 mod pause;
 pub(crate) use pause::pause;

src/commands/play.rs

@@ -11,9 +11,6 @@ use std::ops::Sub;
 use std::{error::Error, time::Duration};
 use tokio::process::Command;
 use tracing::debug;
-use twilight_model::channel::message::embed::{
-    EmbedAuthor, EmbedField, EmbedFooter, EmbedThumbnail,
-};
 use twilight_model::channel::message::MessageFlags;
 use twilight_model::gateway::payload::incoming::InteractionCreate;
 use twilight_model::http::interaction::{InteractionResponse, InteractionResponseType};
@@ -164,35 +161,17 @@ pub(crate) async fn play(
         call.queue().resume()?;
     }
 
-    struct TrackType {
-        url: String,
-        title: Option<String>,
-        duration_string: String,
-        channel: String,
-        thumbnail: Option<String>,
-    }
-
     let mut tracks_added = vec![];
-    for yttrack in &tracks {
-        tracing::debug!("track: {:?}", yttrack);
-        let url = yttrack
-            .original_url
-            .clone()
-            .or(yttrack.url.clone())
-            .ok_or("Could not find url")?;
+    for track in &tracks {
+        tracing::debug!("track: {:?}", track);
+        let url = track.url.clone().or(track.original_url.clone()).ok_or("")?;
         let mut src = YoutubeDl::new(reqwest::Client::new(), url.clone());
         let src_copy = src.clone();
         let track: Track = src_copy.into();
 
         if let Ok(metadata) = src.aux_metadata().await {
             debug!("metadata: {:?}", metadata);
-            tracks_added.push(TrackType {
-                url: url.clone(),
-                title: metadata.title.clone(),
-                duration_string: yttrack.duration_string.clone(),
-                channel: yttrack.channel.clone(),
-                thumbnail: metadata.thumbnail.clone(),
-            });
+            tracks_added.push((url.clone(), metadata.title.clone()));
 
             if let Some(call_lock) = state.songbird.get(guild_id) {
                 let mut call = call_lock.lock().await;
@@ -218,58 +197,16 @@ pub(crate) async fn play(
     }
     let mut content = String::new();
     let num_tracks_added = tracks_added.len();
-    let embeds = match num_tracks_added {
-        0 => {
-            vec![]
-        }
+    match num_tracks_added {
+        0 => {}
         1 => {
-            let track = tracks_added.first().unwrap();
-
-            let host = Url::parse(&track.url)?;
-            let host = host
-                .host_str()
-                .unwrap_or_default()
-                .trim_start_matches("www.");
-            let mut embed = EmbedBuilder::new()
-                .author(EmbedAuthor {
-                    name: "🔊 Added to queue".to_string(),
-                    icon_url: None,
-                    proxy_icon_url: None,
-                    url: None,
-                })
-                .title(track.title.clone().unwrap_or("Unknown".to_string()))
-                .url(track.url.clone())
-                .color(colors::BLURPLE)
-                .footer(EmbedFooter {
-                    text: format!("Streaming from {}", host),
-                    icon_url: Some(format!(
-                        "https://www.google.com/s2/favicons?domain={}",
-                        host
-                    )),
-                    proxy_icon_url: None,
-                })
-                .field(EmbedField {
-                    inline: true,
-                    name: "Duration".to_string(),
-                    value: track.duration_string.clone(),
-                })
-                .field(EmbedField {
-                    inline: true,
-                    name: "Channel".to_string(),
-                    value: track.channel.clone(),
-                })
-                .build();
-
-            if let Some(thumbnail) = &track.thumbnail {
-                embed.thumbnail = Some(EmbedThumbnail {
-                    height: None,
-                    proxy_url: None,
-                    url: thumbnail.to_string(),
-                    width: None,
-                });
-            }
-
-            vec![embed]
+            let (title, url) = if let Some(track) = tracks_added.first() {
+                let track = track.clone();
+                (track.1.unwrap_or("Unknown".to_string()), track.0)
+            } else {
+                ("Unknown".to_string(), "".to_string())
+            };
+            content = format!("Added [{}]({}) to the queue", title, url);
         }
         _ => {
             let first_track = tracks.first().unwrap();
@@ -290,14 +227,13 @@ pub(crate) async fn play(
                 "Added {} tracks to the queue:\n",
                 num_tracks_added
             ));
-            let embed = EmbedBuilder::new()
-                .description(content)
-                .color(colors::BLURPLE)
-                .build();
-            vec![embed]
         }
-    };
+    }
 
+    let embeds = vec![EmbedBuilder::new()
+        .description(content)
+        .color(colors::BLURPLE)
+        .build()];
     state
         .http
         .interaction(interaction.application_id)

src/commands/queue.rs

@@ -59,9 +59,9 @@ pub(crate) async fn build_queue_embeds(queue: &[TrackHandle], page: usize) -> Ve
     }
     message.push('\n');
 
-    let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
-    if n_pages > 1 {
-        message.push_str(&format!("page {}/{}", 1 + page, n_pages));
+    let max_pages = queue.len() / TRACKS_PER_PAGE;
+    if max_pages > 0 {
+        message.push_str(&format!("page {}/{}", 1 + page, 1 + max_pages));
     }
     vec![EmbedBuilder::new()
         .description(&message)
@@ -69,7 +69,10 @@ pub(crate) async fn build_queue_embeds(queue: &[TrackHandle], page: usize) -> Ve
         .build()]
 }
 
-pub(crate) fn build_action_row(page: usize, n_pages: usize) -> Vec<Component> {
+pub(crate) fn build_action_row(page: usize, max_pages: usize) -> Vec<Component> {
+    if max_pages == 0 {
+        return Vec::new();
+    }
     vec![Component::ActionRow(ActionRow {
         components: vec![
             Component::Button(Button {
@@ -82,16 +85,6 @@ pub(crate) fn build_action_row(page: usize, n_pages: usize) -> Vec<Component> {
                 url: None,
                 disabled: page == 0,
             }),
-            Component::Button(Button {
-                custom_id: Some(format!("page:{}", page)),
-                style: ButtonStyle::Primary,
-                label: Some("Refresh".to_string()),
-                emoji: Some(ReactionType::Unicode {
-                    name: "🔄".to_string(),
-                }),
-                url: None,
-                disabled: false,
-            }),
             Component::Button(Button {
                 custom_id: Some(format!("page:{}", page + 1)),
                 style: ButtonStyle::Primary,
@@ -100,7 +93,7 @@ pub(crate) fn build_action_row(page: usize, n_pages: usize) -> Vec<Component> {
                     name: "➡️".to_string(),
                 }),
                 url: None,
-                disabled: page >= n_pages - 1,
+                disabled: page >= max_pages,
             }),
         ],
     })]
@@ -146,8 +139,7 @@ pub(crate) async fn queue(
     }
 
     let embeds = build_queue_embeds(&queue, 0).await;
-    let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
-    let action_row = build_action_row(0, n_pages);
+    let action_row = build_action_row(0, queue.len() / TRACKS_PER_PAGE);
 
     state
         .http

src/commands/stop.rs

@@ -23,10 +23,6 @@ pub(crate) async fn stop(
         return Ok(());
     };
 
-    state.guild_settings.entry(guild_id).and_modify(|settings| {
-        settings.loop_queue = false;
-    });
-
     if let Some(call_lock) = state.songbird.get(guild_id) {
         let call = call_lock.lock().await;
         call.queue().stop();

src/handler.rs

@@ -1,19 +1,79 @@
 use crate::commands::queue::{build_action_row, build_queue_embeds, TRACKS_PER_PAGE};
-use crate::commands::{
-    delete, join, leave, leave_if_alone, loop_queue, pause, play, queue, resume, skip, stop,
-};
-use crate::interaction_commands::InteractionCommand;
+use crate::commands::{delete, join, leave, loop_queue, pause, play, queue, resume, skip, stop};
 use crate::state::State;
-use crate::utils::spawn;
-use anyhow::Context;
+use futures::Future;
+use std::error::Error;
 use std::sync::Arc;
+use tracing::debug;
 use twilight_gateway::Event;
-use twilight_model::application::interaction::message_component::MessageComponentInteractionData;
+use twilight_model::application::interaction::application_command::{
+    CommandData, CommandOptionValue,
+};
 use twilight_model::application::interaction::InteractionData;
-use twilight_model::gateway::payload::incoming::InteractionCreate;
+use twilight_model::gateway::payload::incoming::VoiceStateUpdate;
 use twilight_model::http::interaction::{InteractionResponse, InteractionResponseType};
 use twilight_util::builder::InteractionResponseDataBuilder;
 
+#[derive(Debug)]
+enum InteractionCommand {
+    Play(String),
+    Stop,
+    Pause,
+    Skip,
+    Loop,
+    Resume,
+    Leave,
+    Join,
+    Queue,
+    NotImplemented,
+}
+
+fn spawn(
+    fut: impl Future<Output = Result<(), Box<dyn Error + Send + Sync + 'static>>> + Send + 'static,
+) {
+    tokio::spawn(async move {
+        if let Err(why) = fut.await {
+            tracing::debug!("handler error: {:?}", why);
+        }
+    });
+}
+
+pub(crate) async fn leave_if_alone(
+    update: VoiceStateUpdate,
+    state: State,
+) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
+    let guild_id = update.guild_id.ok_or("Guild ID not found")?;
+    let user = state
+        .cache
+        .current_user()
+        .ok_or("Cannot get current user")?;
+    let user_voice_state = state
+        .cache
+        .voice_state(user.id, guild_id)
+        .ok_or("Cannot get voice state")?;
+    let channel = state
+        .cache
+        .channel(user_voice_state.channel_id())
+        .ok_or("Cannot get channel")?;
+    let channel_voice_states = state
+        .cache
+        .voice_channel_states(channel.id)
+        .ok_or("Cannot get voice channel")?;
+    let count = channel_voice_states.count();
+
+    // count is 1 if the bot is the only one in the channel
+    if count == 1 {
+        // stop playing
+        if let Some(call_lock) = state.songbird.get(guild_id) {
+            let call = call_lock.lock().await;
+            call.queue().stop();
+        }
+        // leave the voice channel
+        state.songbird.leave(guild_id).await?;
+    }
+    Ok(())
+}
+
 pub(crate) struct Handler {
     state: State,
 }
@@ -23,13 +83,6 @@ impl Handler {
         Self { state }
     }
     pub(crate) async fn act(&self, event: Event) -> anyhow::Result<()> {
-        self.handle_messages(&event).await?;
-        self.handle_voice_state_update(&event).await?;
-        self.handle_interaction(&event).await?;
-        Ok(())
-    }
-
-    async fn handle_messages(&self, event: &Event) -> anyhow::Result<()> {
         match event {
             Event::MessageCreate(message) if message.content.starts_with('!') => {
                 if message.content.contains("!delete") {
@@ -37,102 +90,121 @@ impl Handler {
                 }
                 Ok(())
             }
-            _ => Ok(()),
-        }
-    }
-
-    async fn handle_voice_state_update(&self, event: &Event) -> anyhow::Result<()> {
-        match event {
             Event::VoiceStateUpdate(update) => {
-                let guild_id = update.guild_id.context("Guild ID not found")?;
-                spawn(leave_if_alone(guild_id, Arc::clone(&self.state)));
+                spawn(leave_if_alone(*update.clone(), Arc::clone(&self.state)));
                 Ok(())
             }
-            _ => Ok(()),
-        }
-    }
+            Event::InteractionCreate(interaction) => {
+                tracing::info!("interaction: {:?}", &interaction);
+                match &interaction.data {
+                    Some(InteractionData::ApplicationCommand(command)) => {
+                        let interaction_command = parse_interaction_command(command);
+                        debug!("{:?}", interaction_command);
+                        match interaction_command {
+                            InteractionCommand::Play(query) => {
+                                spawn(play(interaction, Arc::clone(&self.state), query))
+                            }
+                            InteractionCommand::Stop => {
+                                spawn(stop(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Pause => {
+                                spawn(pause(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Skip => {
+                                spawn(skip(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Loop => {
+                                spawn(loop_queue(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Resume => {
+                                spawn(resume(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Leave => {
+                                spawn(leave(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Join => {
+                                spawn(join(interaction, Arc::clone(&self.state)))
+                            }
+                            InteractionCommand::Queue => {
+                                spawn(queue(interaction, Arc::clone(&self.state)))
+                            }
+                            _ => {}
+                        }
+                        Ok(())
+                    }
+                    Some(InteractionData::MessageComponent(data)) => {
+                        tracing::info!("message component: {:?}", data);
 
-    async fn handle_interaction(&self, event: &Event) -> anyhow::Result<()> {
-        match event {
-            Event::InteractionCreate(interaction) => match &interaction.data {
-                Some(InteractionData::ApplicationCommand(command)) => {
-                    self.handle_application_command(command.clone().into(), interaction.clone())
-                }
-                Some(InteractionData::MessageComponent(data)) => {
-                    self.handle_message_component(data, interaction.clone())
-                        .await
-                }
-                _ => Ok(()),
-            },
-            _ => Ok(()),
-        }
-    }
+                        if !data.custom_id.starts_with("page:") {
+                            return Ok(());
+                        }
+                        let page = data
+                            .custom_id
+                            .trim_start_matches("page:")
+                            .parse::<usize>()
+                            .unwrap_or(0);
+                        tracing::info!("page: {:?}", page);
 
-    fn handle_application_command(
-        &self,
-        command: InteractionCommand,
-        interaction: Box<InteractionCreate>,
-    ) -> anyhow::Result<()> {
-        {
-            match command {
-                InteractionCommand::Play(query) => {
-                    spawn(play(interaction, Arc::clone(&self.state), query))
+                        if let Some(guild_id) = interaction.guild_id {
+                            let mut queue = Vec::new();
+                            if let Some(call_lock) = self.state.songbird.get(guild_id) {
+                                let call = call_lock.lock().await;
+                                queue = call.queue().current_queue();
+                            }
+                            let embeds = build_queue_embeds(&queue, page).await;
+                            let action_row = build_action_row(page, queue.len() / TRACKS_PER_PAGE);
+
+                            let interaction_response_data = InteractionResponseDataBuilder::new()
+                                .embeds(embeds)
+                                .components(action_row)
+                                .build();
+                            let response = InteractionResponse {
+                                kind: InteractionResponseType::UpdateMessage,
+                                data: Some(interaction_response_data),
+                            };
+                            self.state
+                                .http
+                                .interaction(interaction.application_id)
+                                .create_response(interaction.id, &interaction.token, &response)
+                                .await?;
+                            Ok(())
+                        } else {
+                            Ok(())
+                        }
+                    }
+                    _ => Ok(()),
                 }
-                InteractionCommand::Stop => spawn(stop(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Pause => spawn(pause(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Skip => spawn(skip(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Loop => spawn(loop_queue(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Resume => spawn(resume(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Leave => spawn(leave(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Join => spawn(join(interaction, Arc::clone(&self.state))),
-                InteractionCommand::Queue => spawn(queue(interaction, Arc::clone(&self.state))),
-                _ => {}
             }
-            Ok(())
-        }
-    }
-
-    async fn handle_message_component(
-        &self,
-        data: &MessageComponentInteractionData,
-        interaction: Box<InteractionCreate>,
-    ) -> anyhow::Result<()> {
-        if !data.custom_id.starts_with("page:") {
-            return Ok(());
-        }
-        let page = data
-            .custom_id
-            .trim_start_matches("page:")
-            .parse::<usize>()
-            .unwrap_or(0);
-
-        if let Some(guild_id) = interaction.guild_id {
-            let mut queue = Vec::new();
-            if let Some(call_lock) = self.state.songbird.get(guild_id) {
-                let call = call_lock.lock().await;
-                queue = call.queue().current_queue();
+            event => {
+                tracing::info!("unhandled event: {:?}", event);
+                Ok(())
             }
-            let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
-            let page = page.min(n_pages - 1).max(0);
-            let embeds = build_queue_embeds(&queue, page).await;
-            let action_row = build_action_row(page, n_pages);
-
-            let interaction_response_data = InteractionResponseDataBuilder::new()
-                .embeds(embeds)
-                .components(action_row)
-                .build();
-            let response = InteractionResponse {
-                kind: InteractionResponseType::UpdateMessage,
-                data: Some(interaction_response_data),
-            };
-            self.state
-                .http
-                .interaction(interaction.application_id)
-                .create_response(interaction.id, &interaction.token, &response)
-                .await?;
-            Ok(())
-        } else {
-            Ok(())
         }
     }
 }
+
+fn parse_interaction_command(command: &CommandData) -> InteractionCommand {
+    debug!("command: {:?}", command);
+    match command.name.as_str() {
+        "play" => {
+            if let Some(query_option) = command.options.iter().find(|opt| opt.name == "query") {
+                if let CommandOptionValue::String(query) = &query_option.value {
+                    InteractionCommand::Play(query.clone())
+                } else {
+                    InteractionCommand::NotImplemented
+                }
+            } else {
+                InteractionCommand::NotImplemented
+            }
+        }
+        "stop" => InteractionCommand::Stop,
+        "pause" => InteractionCommand::Pause,
+        "skip" => InteractionCommand::Skip,
+        "loop" => InteractionCommand::Loop,
+        "resume" => InteractionCommand::Resume,
+        "leave" => InteractionCommand::Leave,
+        "join" => InteractionCommand::Join,
+        "queue" => InteractionCommand::Queue,
+        _ => InteractionCommand::NotImplemented,
+    }
+}

src/interaction_commands.rs

@@ -1,44 +0,0 @@
-use twilight_model::application::interaction::application_command::{
-    CommandData, CommandOptionValue,
-};
-
-#[derive(Debug)]
-pub(crate) enum InteractionCommand {
-    Play(String),
-    Stop,
-    Pause,
-    Skip,
-    Loop,
-    Resume,
-    Leave,
-    Join,
-    Queue,
-    NotImplemented,
-}
-
-impl From<Box<CommandData>> for InteractionCommand {
-    fn from(command: Box<CommandData>) -> InteractionCommand {
-        match command.name.as_str() {
-            "play" => {
-                if let Some(query_option) = command.options.iter().find(|opt| opt.name == "query") {
-                    if let CommandOptionValue::String(query) = &query_option.value {
-                        InteractionCommand::Play(query.clone())
-                    } else {
-                        InteractionCommand::NotImplemented
-                    }
-                } else {
-                    InteractionCommand::NotImplemented
-                }
-            }
-            "stop" => InteractionCommand::Stop,
-            "pause" => InteractionCommand::Pause,
-            "skip" => InteractionCommand::Skip,
-            "loop" => InteractionCommand::Loop,
-            "resume" => InteractionCommand::Resume,
-            "leave" => InteractionCommand::Leave,
-            "join" => InteractionCommand::Join,
-            "queue" => InteractionCommand::Queue,
-            _ => InteractionCommand::NotImplemented,
-        }
-    }
-}

src/main.rs

@@ -2,11 +2,9 @@ mod handler;
 use handler::Handler;
 mod colors;
 mod commands;
-mod interaction_commands;
 mod metadata;
 mod signal;
 mod state;
-mod utils;
 
 use crate::commands::get_chat_commands;
 use dotenv::dotenv;

src/state.rs

@@ -13,18 +13,6 @@ pub(crate) struct Settings {
     pub(crate) loop_queue: bool,
 }
 
-impl Settings {
-    pub(crate) fn new() -> Self {
-        Self { loop_queue: false }
-    }
-}
-
-impl Default for Settings {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 #[derive(Debug)]
 pub(crate) struct StateRef {
     pub(crate) http: HttpClient,

src/utils.rs

@@ -1,12 +0,0 @@
-use futures::Future;
-use std::error::Error;
-
-pub(crate) fn spawn(
-    fut: impl Future<Output = Result<(), Box<dyn Error + Send + Sync + 'static>>> + Send + 'static,
-) {
-    tokio::spawn(async move {
-        if let Err(why) = fut.await {
-            tracing::debug!("handler error: {:?}", why);
-        }
-    });
-}