Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "moover_rust"
-version = "3.4.2"
+version = "3.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.9.0"
+rand = "0.8.5"
 anyhow = "1.0.95"
 tokio-cron-scheduler = "0.13.0"
 dotenv = "0.15.0"
@@ -26,7 +26,7 @@ reqwest = "0.11.27" # songbird depends on ^0.11
 radiobrowser = { path = "./radiobrowser-lib-rust" }
 
 [dependencies.symphonia]
-version = "0.5.4"
+version = "0.5.2"
 features = ["aac", "mp3", "isomp4", "alac"]
 
 [features]

README.md

@@ -14,6 +14,10 @@
 Make sure you have cargo installed!
 Edit .env.example and rename to .env
 
+Check if you have `openssl` (libssl-dev Ubuntu, openssl-devel Fedora)
+audiopus_sys requires `cmake`
+some dependencies require `build-essential`
+
 Compile debug version
 ```
 make dev
@@ -33,16 +37,3 @@ Run release version
 ```
 make run_rel
 ```
-
-## Dependencies
-Check if you have `openssl` (libssl-dev Ubuntu, openssl-devel Fedora)
-
-audiopus_sys requires `cmake`
-
-some dependencies require `build-essential`
-
-`yt-dlp` used for general_player
-
-Look at [yt-dlp dependencies](https://github.com/yt-dlp/yt-dlp?tab=readme-ov-file#dependencies) if something's not working
-
-`ffmpeg` for yt-dlp

src/commands/help.rs

@@ -5,11 +5,7 @@ use crate::types::Context;
 type Error = Box<dyn std::error::Error + Send + Sync>;
 
 /// Show help message
-#[poise::command(
-    slash_command,
-    track_edits,
-    category = "Help")
-]
+#[poise::command(slash_command, track_edits, category = "Utility")]
 pub async fn help(
     ctx: Context<'_>,
     #[description = "Command to get help for"]

src/commands/moover/gif.rs

@@ -1,7 +1,7 @@
 use poise;
 use serenity::all::{Embed, User};
 
-use crate::types::{Context, ContextExt, Error};
+use crate::types::{Error, Context};
 
 #[poise::command(
     slash_command,
@@ -15,6 +15,6 @@ pub async fn gif(ctx: Context<'_>,
 ) -> Result<(), Error> {
     // let embed;
     // send_with_embed(ctx, "hug", &title, &desc).await?;
-    ctx.reply_ephemeral("Done!").await?;
+    ctx.reply("Done!").await?;
     Ok(())
 }

src/commands/moover/moove.rs

@@ -1,4 +1,4 @@
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::Context;
@@ -6,19 +6,17 @@ use serenity::builder::{CreateAttachment, CreateEmbed, CreateMessage};
 use serenity::http::Http;
 use serenity::model::channel::Message;
 use tokio::time::sleep;
-use serenity::model::id::ChannelId;
-
 use regex::Regex;
-
-static RE_CHANNEL_ID: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"<#[0-9]*>$").unwrap());
+use serenity::model::id::ChannelId;
 
 
 /// Checks if the message should be mooved
 /// If the message should be mooved, try to move it and return Ok if mooved succesfully
 pub async fn moove_check(msg: &Message) -> Option<u64> {
     let word_count = msg.content.trim().split_whitespace().count();
+    let re = Regex::new(r"<#[0-9]*>$").unwrap();
 
-    if word_count != 1 || RE_CHANNEL_ID.captures(&msg.content).is_none() {
+    if word_count != 1 || re.captures(&msg.content).is_none() {
         return None
     }
 

src/commands/user_interactions/headpat.rs

@@ -1,12 +1,12 @@
+use poise;
 use serenity::all::User;
 
 use super::interaction::send_with_embed;
-use crate::types::{Context, Error};
+use crate::types::{Error, Context};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Headpat all your friends!"),
-    category = "Interaction"
+    description_localized("en-US", "Headpat all your friends!")
 )]
 pub async fn headpat(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
@@ -15,5 +15,6 @@ pub async fn headpat(ctx: Context<'_>,
     let title = "HEADPATS!";
     let desc = format!("{} headpats {}", ctx.author(), user);
     send_with_embed(ctx, "headpat", &title, &desc).await?;
+    ctx.reply("Done!").await?;
     Ok(())
 }

src/commands/user_interactions/hug.rs

@@ -2,12 +2,11 @@ use poise;
 use serenity::all::User;
 
 use super::interaction::send_with_embed;
-use crate::types::{Context, Error};
+use crate::types::{Error, Context};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Hug all your friends!"),
-    category = "Interaction"
+    description_localized("en-US", "Hug all your friends!")
 )]
 pub async fn hug(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
@@ -16,5 +15,6 @@ pub async fn hug(ctx: Context<'_>,
     let title = "HUGS!";
     let desc = format!("{} hugs {}", ctx.author(), user);
     send_with_embed(ctx, "hug", &title, &desc).await?;
+    ctx.reply("Done!").await?;
     Ok(())
 }

src/commands/user_interactions/interaction.rs

@@ -1,8 +1,8 @@
-use poise::CreateReply;
-use serenity::all::{Colour, CreateEmbed};
+use anyhow::anyhow;
+use serenity::all::{Colour, CreateEmbed, CreateMessage};
 use tenorv2::tenor_builder::Tenor;
 
-use crate::{types::Context, utils::gifs::get_random_tenor_gif};
+use crate::{types::Context, utils::{gifs::get_random_tenor_gif, utilities}};
 
 /// Sends embed with random tenor gif from searched query
 /// title and desc are used in the embed
@@ -20,7 +20,17 @@ pub(super) async fn send_with_embed(ctx: Context<'_>, query: &str, title: &str,
         .description(desc)
         .image(url.as_str());
 
-    ctx.send(CreateReply::default().embed(embed)).await?;
+    if ctx.guild_id().is_none() {
+        return Err(anyhow!("Guild id not available in context"));
+    }
+
+    utilities::get_system_channel(
+        ctx.guild_id().unwrap(), ctx.http()
+    ).await?
+    .send_message(
+        ctx.http(),
+        CreateMessage::new().add_embed(embed)
+    ).await?;
 
     Ok(())
 }

src/commands/voice.rs

@@ -5,3 +5,8 @@ pub mod player_common;
 pub mod radio;
 pub mod general_player;
 pub mod voice_types;
+
+// ! not working
+// pub mod yt;
+// TODO implement
+// pub mod spotify;

src/commands/voice/general_player.rs

@@ -1,7 +1,6 @@
 use std::vec;
 
 use songbird::input::YoutubeDl;
-use songbird::TrackEvent;
 
 use crate::types::{Context, ContextExt, Error};
 use crate::commands::voice::voice_utils::autocomplete_channel;
@@ -11,9 +10,7 @@ use super::connect;
 // For list of supported URLs visit https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Plays music from supported URL"),
-    category = "Voice",
-    guild_only
+    description_localized("en-US", "Plays music from supported URL")
 )]
 pub async fn play(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -22,20 +19,34 @@ pub async fn play(ctx: Context<'_>,
     #[description = "Source URL: "]
     url: String,
 ) -> Result<(), Error> {
-    let events = vec![TrackEvent::End];
-    let (manager, guild_id) = match connect(&ctx, channel, events).await {
-        Ok(result) => result,
-        Err(e) => {
+
+    if ctx.guild().is_none() {
+        ctx.reply_ephemeral("Can't use this outside of guild").await?;
+        return Ok(());
+    }
+
+    let manager = songbird::get(ctx.serenity_context())
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone();
+
+    let Some(guild_id) = ctx.guild_id() else {
+        ctx.reply_ephemeral("Guild id not found").await?;
+        return Ok(())
+    };
+
+    let http_client = &ctx.data().http_client;
+
+    if manager.get(guild_id).is_none() {
+        if let Err(e) = connect(&ctx, guild_id, channel).await {
             ctx.reply_ephemeral(&e.to_string()).await?;
-            println!("SONGBIRD MANAGER ERROR: {}", e.to_string());
             return Ok(())
         }
-    };
+    }
 
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;
 
-        let http_client = &ctx.data().http_client;
         let src = YoutubeDl::new(http_client.clone(), url);
         handler.enqueue_input(src.into()).await;
     }

src/commands/voice/player_common.rs

@@ -2,7 +2,6 @@ use std::vec;
 
 use poise::CreateReply;
 use songbird::input::{File, Input};
-use songbird::TrackEvent;
 
 use crate::utils::debug::send_error;
 use crate::types::{Context, ContextExt, Error};
@@ -18,9 +17,7 @@ use super::voice_utils::{connect, autocomplete_channel};
 /// Disconnect bot from voice channel
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Disconnect from voice channel"),
-    category = "Voice",
-    guild_only
+    description_localized("en-US", "Disconnect from voice channel")
 )]
 pub async fn disconnect(
     ctx: Context<'_>
@@ -39,7 +36,7 @@ pub async fn disconnect(
     let has_handler = manager.get(guild_id).is_some();
 
     if ! has_handler {
-        ctx.reply_ephemeral("I am not connected to a channel!").await?;
+        ctx.reply("I am not connected to a channel!").await?;
         return Ok(())
     }
 
@@ -69,9 +66,7 @@ async fn autocomplete_song(
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Play song from server storage"),
-    category = "Voice",
-    guild_only
+    description_localized("en-US", "Play song from server storage")
 )]
 pub async fn play_local(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -81,15 +76,31 @@ pub async fn play_local(ctx: Context<'_>,
     #[description = "Filename of local song: "]
     file_name: String
 ) -> Result<(), Error> {
-    let events = vec![TrackEvent::End];
-    let (manager, guild_id) = match connect(&ctx, channel, events).await {
-        Ok(result) => result,
+
+    if ctx.guild().is_none() {
+        ctx.reply_ephemeral("Can't use this outside of guild").await?;
+        return Ok(());
+    }
+
+    let manager = songbird::get(ctx.serenity_context())
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone();
+
+    let Some(guild_id) = ctx.guild_id() else {
+        ctx.reply_ephemeral("Guild id not found").await?;
+        return Ok(())
+    };
+
+    if manager.get(guild_id).is_none() {
+        match connect(&ctx, guild_id, channel).await {
+            Ok(_) => (),
             Err(e) => {
                 ctx.reply_ephemeral(&e.to_string()).await?;
-            println!("SONGBIRD MANAGER ERROR: {}", e.to_string());
                 return Ok(())
             }
-    };
+        }
+    }
 
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;
@@ -110,9 +121,7 @@ pub async fn play_local(ctx: Context<'_>,
 /// Sends embed with some info about currently playing source
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Display currently playing info"),
-    category = "Voice",
-    guild_only
+    description_localized("en-US", "Display currently playing info")
 )]
 pub async fn playing(ctx: Context<'_>) -> Result<(), Error> {
 
@@ -141,6 +150,8 @@ pub async fn playing(ctx: Context<'_>) -> Result<(), Error> {
         playing_info.generate_embed().await    
     };
 
+    dbg!(&embed);
+
     ctx.send(
         CreateReply::default()
             .embed(embed)

src/commands/voice/radio/radio_player.rs

@@ -5,7 +5,6 @@ use reqwest::Client;
 
 use songbird::input::Input;
 use songbird::input::HttpRequest;
-use songbird::TrackEvent;
 
 use super::super::connect;
 use super::link_or_string;
@@ -22,8 +21,7 @@ use crate::commands::voice::voice_utils::autocomplete_channel;
 #[poise::command(
     slash_command,
     description_localized("en-US", "Plays music from URL source"),
-    subcommands("search", "play"),
-    guild_only
+    subcommands("search", "play")
 )]
 pub async fn radio(_ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
@@ -32,8 +30,7 @@ pub async fn radio(_ctx: Context<'_>) -> Result<(), Error> {
 /// Play online radio stream directly from URL or autocompleted string
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Plays music from URL source"),
-    category = "Voice"
+    description_localized("en-US", "Plays music from URL source")
 )]
 pub async fn play(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -43,6 +40,12 @@ pub async fn play(ctx: Context<'_>,
     #[description = "Radio station: "]
     name: String,
 ) -> Result<(), Error> {
+
+    if ctx.guild().is_none() {
+        ctx.reply_ephemeral("Can't use this outside of guild").await?;
+        return Ok(());
+    }
+
     let api = &ctx.data().radio_browser;
     
     let stations_result = match link_or_string(&name) {
@@ -84,15 +87,23 @@ pub async fn play(ctx: Context<'_>,
         return Ok(())
     };
 
-    let events = vec![TrackEvent::End];
-    let (manager, guild_id) = match connect(&ctx, channel, events).await {
-        Ok(result) => result,
-        Err(e) => {
+    let manager = songbird::get(ctx.serenity_context())
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone();
+
+    let Some(guild_id) = ctx.guild_id() else {
+        ctx.reply_ephemeral("Guild id not found").await?;
+        return Ok(())
+    };
+
+    if manager.get(guild_id).is_none() {
+        if let Err(e) = connect(&ctx, guild_id, channel).await {
             ctx.reply_ephemeral(&e.to_string()).await?;
             println!("SONGBIRD MANAGER ERROR: {}", e.to_string());
             return Ok(())
         }
-    };
+    }
 
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;
@@ -142,8 +153,7 @@ async fn autocomplete_radio(
 /// Search online radios (you can use stream URL from output for /play) 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Search for a radio"),
-    category = "Voice"
+    description_localized("en-US", "Search for a radio")
 )]
 pub async fn search(ctx: Context<'_>,
     #[description = "Radio station: "]

src/commands/voice/radio/radio_utils.rs

@@ -1,17 +1,15 @@
-use std::sync::LazyLock;
-
 use poise::CreateReply;
 use radiobrowser::{ApiStation, StationSearchBuilder};
 use regex::Regex;
 use serenity::all::{CreateActionRow, CreateButton, CreateEmbed, CreateEmbedFooter, CreateInteractionResponse, CreateInteractionResponseMessage};
 
-use crate::{commands::voice_types::NumberOfEntries, types::{Context, ContextExt, Error}};
+use crate::{commands::voice_types::NumberOfEntries, types::Context};
 
 pub async fn paginate_search_stations(
     ctx: &Context<'_>,
     search_builder: &StationSearchBuilder,
     limit: NumberOfEntries
-) -> Result<(), Error> {
+) -> Result<(), serenity::Error> {
     // Define some unique identifiers for the navigation buttons
     let ctx_id = ctx.id();
     let prev_button_id = format!("{}prev", ctx_id);
@@ -20,7 +18,7 @@ pub async fn paginate_search_stations(
     let search_builder = search_builder;
     
     let Ok(stations) = search_builder.clone().send().await else {
-        ctx.reply_ephemeral("Something went wrong, try searching again").await?;
+        ctx.reply("Something went wrong, try searching again").await?;
         return Ok(())
     };
     
@@ -66,7 +64,7 @@ pub async fn paginate_search_stations(
         }
 
         let Ok(mut stations) = search_builder.clone().offset(offset.to_string()).send().await else {
-            ctx.reply_ephemeral("Something went wrong, try searching again").await?;
+            ctx.reply("Something went wrong, try searching again").await?;
             return Ok(())
         };
 
@@ -75,7 +73,7 @@ pub async fn paginate_search_stations(
             page = 0;
             
             let Ok(new_stations) = search_builder.clone().offset(offset.to_string()).send().await else {
-                ctx.reply_ephemeral("Something went wrong, try searching again").await?;
+                ctx.reply("Something went wrong, try searching again").await?;
                 return Ok(())
             };
             stations = new_stations;
@@ -120,16 +118,20 @@ pub enum LinkString {
     String
 }
 
-static RE_URL: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"^https?://([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$").unwrap());
-
 pub fn link_or_string(haystack: &str) -> LinkString {
-    return if RE_URL.is_match(haystack) { LinkString::Link } else { LinkString::String }
+    let Ok(re) = Regex::new(r"^https?://([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$") else {
+        panic!("Wrong regex expression!");
+    };
+
+    return if re.is_match(haystack) { LinkString::Link } else { LinkString::String }
 }
 
-static RE_AUTOCOMPLETE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"^Name: (.*) Country: (.*) Language: (.*)").unwrap());
-
 pub fn parse_radio_autocomplete(haystack: &str) -> Option<(String, String, String)> {
-    let Some(captures) = RE_AUTOCOMPLETE.captures(haystack) else {
+    let Ok(re) = Regex::new(r"^Name: (.*) Country: (.*) Language: (.*)") else {
+        panic!("Wrong regex expression!");
+    };
+
+    let Some(captures) = re.captures(haystack) else {
         return None
     };
 

src/commands/voice/voice_types.rs

@@ -35,6 +35,7 @@ pub struct GeneralInfo {
     pub duration: Option<String>
 }
 
+
 #[async_trait]
 impl GenerateEmbed for GeneralInfo {
     async fn generate_embed(&self) -> CreateEmbed {

src/commands/voice/voice_utils.rs

@@ -1,14 +1,10 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use serenity::all::{CacheHttp, ChannelId, CreateMessage, GuildId};
+use serenity::all::{ChannelId, GuildId};
 use serenity::async_trait;
 
 use songbird::events::{Event, EventContext, EventHandler as VoiceEventHandler};
-use songbird::{Songbird, TrackEvent};
-use tokio::time::sleep;
+use songbird::TrackEvent;
 
-use crate::{types::Context, utils::utilities::get_channel_by_name};
+use crate::{types::{Context, Error}, utils::utilities::get_channel_by_name};
 
 pub const MAX_ENTRIES: &str = "15";
 
@@ -34,87 +30,18 @@ async fn get_voice_channel(ctx: &Context<'_>, name: Option<String>) -> Result<Ch
     }
 }
 
-struct TrackEventNotifier {
-    ctx: serenity::all::Context,
-    guild_id: GuildId,
-    channel_id: ChannelId
-}
-
-impl TrackEventNotifier {
-    fn new(ctx: serenity::all::Context,
-            guild_id: GuildId,
-            channel_id: ChannelId) -> TrackEventNotifier {
-        TrackEventNotifier {
-            ctx,
-            guild_id,
-            channel_id
-        }
-    }
-}
-
-#[async_trait]
-impl VoiceEventHandler for TrackEventNotifier {
-    async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
-        if let EventContext::Track(track_list) = ctx {
-            for (_, _) in *track_list {
-                sleep(Duration::from_secs(60)).await;     
-                let manager = songbird::get(&self.ctx)
-                    .await
-                    .expect("Songbird Voice client placed in at initialisation.")
-                    .clone();
-
-                if let Some(handler_lock) = manager.get(self.guild_id) {
-                    let handler = handler_lock.lock().await;
-                    if !handler.queue().is_empty() {
-                        return None
-                    }
-
-                    drop(handler);
-                    drop(handler_lock);
-                    match manager.remove(self.guild_id).await {
-                        Ok(_) => (),
-                        Err(e) => {
-                            dbg!(e);
-                            ()
-                        }
-                    }
-
-                    let _ = self.channel_id.say(self.ctx.http(), "Disconnected to save bandwidth!").await;
-                };
-            }
-        }
-
-        None
-    }
-}
-
-
-struct TrackErrorNotifier {
-    ctx: serenity::all::Context,
-    channel_id: ChannelId
-}
-
-impl TrackErrorNotifier {
-    fn new(ctx: serenity::all::Context, channel_id: ChannelId) -> TrackErrorNotifier {
-        TrackErrorNotifier {
-            ctx,
-            channel_id
-        }
-    }
-}
+struct TrackErrorNotifier;
 
 #[async_trait]
 impl VoiceEventHandler for TrackErrorNotifier {
     async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
         if let EventContext::Track(track_list) = ctx {
-            for (_, _) in *track_list {
-                match self.channel_id.send_message(
-                    self.ctx.http(),
-                    CreateMessage::new().content("There was an error when playing a track!")
-                ).await {
-                    Ok(_) => (),
-                    Err(e) => println!("{}", e)
-                };
+            for (state, handle) in *track_list {
+                println!(
+                    "Track {:?} encountered an error: {:?}",
+                    handle.uuid(),
+                    state.playing
+                );
             }
         }
 
@@ -122,16 +49,7 @@ impl VoiceEventHandler for TrackErrorNotifier {
     }
 }
 
-
-pub async fn connect(ctx: &Context<'_>, channel: Option<String>, events: Vec<TrackEvent>) -> Result<(Arc<Songbird>, GuildId), String> {
-    if ctx.guild().is_none() {
-        return Err("This command can be used only in guild".to_string())
-    }
-
-    let Some(guild_id) = ctx.guild_id() else {
-        return Err("Guild id not found".to_string())
-    };
-
+pub async fn connect(ctx: &Context<'_>, guild_id: GuildId, channel: Option<String>) -> Result<(), Error> {
     let voice_channel = get_voice_channel(&ctx, channel).await?;
 
     let manager = songbird::get(ctx.serenity_context())
@@ -141,20 +59,10 @@ pub async fn connect(ctx: &Context<'_>, channel: Option<String>, events: Vec<Tra
 
     if let Ok(handler_lock) = manager.join(guild_id, voice_channel).await {
         let mut handler = handler_lock.lock().await;
-        handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier::new(ctx.serenity_context().clone(), voice_channel));
-        for event in events {
-            handler.add_global_event(
-                event.into(),
-                TrackEventNotifier::new(
-                    ctx.serenity_context().clone(),
-                    guild_id,
-                    voice_channel
-                )
-            );
-        }
+        handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
     }
 
-    Ok((manager, guild_id))
+    Ok(())
 }
 
 pub async fn autocomplete_channel(

src/commands/voice/yt/yt_player.rs

@@ -6,6 +6,7 @@ use songbird::input::YoutubeDl;
 use crate::commands::util::connect;
 use crate::util::poise_context_extension::ContextExt;
 use crate::types::{Context, Error};
+use crate::commands::voice::util::autocomplete_channel;
 
 // TODO: search, queue
 #[poise::command(
@@ -13,9 +14,9 @@ use crate::types::{Context, Error};
     description_localized("en-US", "Plays music from YouTube URL")
 )]
 pub async fn play_yt(ctx: Context<'_>,
+    #[autocomplete = "autocomplete_channel"]
     #[description = "Voice channel name: "]
-    #[channel_types("Voice")]
-    channel: Option<GuildChannel>,
+    channel: Option<String>,
     #[description = "Source URL: "]
     url: String,
 ) -> Result<(), Error> {

src/handlers.rs

@@ -1,2 +0,0 @@
-pub mod message_handler;
-pub mod voice_state_handler;

src/handlers/voice_state_handler.rs

@@ -1,110 +0,0 @@
-use std::time::Duration;
-
-use serenity::all::{Context, CreateMessage, GuildChannel, VoiceState};
-use tokio::time::sleep;
-
-use crate::utils::{debug::send_error, voice_state_to_guild_channel};
-
-async fn get_channel_info(ctx: &Context, voice_state: &VoiceState) -> Option<GuildChannel> {
-    let voice_channel = voice_state_to_guild_channel(&ctx, &voice_state).await?;
-
-    let Ok(members) = voice_channel.members(&ctx.cache) else {
-        return None
-    };
-
-    let mut is_connected = false;
-    let mut users_connected: usize = 0;
-    for member in &members {
-        if member.user.id == ctx.cache.current_user().id {
-            is_connected = true
-        }
-        if ! member.user.bot {
-            users_connected += 1;
-        }
-    }
-
-    // Check if there is no real user in the voice channel
-    if ! is_connected || users_connected > 0 {
-        return None;
-    }
-
-    Some(voice_channel)
-}
-
-pub async fn handle_autodisconnect(ctx: Context, voice_state_old: VoiceState, voice_state: VoiceState) -> Option<()> {
-        // Logic is as follows:
-        // User connected -> voice_state_old is None (we handle this before this function)
-        // Bot was moved to different vc -> we check if the new voice_state has the bot's user id
-        // User moved to different VC or disconnected -> we check old channel instead (the bot could be still there)
-        let mut voice_channel: GuildChannel;
-        if voice_state.user_id == ctx.cache.current_user().id {
-            voice_channel = get_channel_info(&ctx, &voice_state).await?;
-        }
-        // Someone disconnected or moved channels
-        else {
-            voice_channel = get_channel_info(&ctx, &voice_state_old).await?;
-        }
-    
-        let manager = songbird::get(&ctx)
-            .await
-            .expect("Songbird Voice client placed in at initialisation.")
-            .clone();
-    
-        // bot is not connected to any channel via songbird, don't need to do anything
-        if manager.get(voice_channel.guild_id).is_none() {
-            return None;
-        }
-    
-        // There is a problem with this implementation
-        // if bot is left alone and users joins and disconnects while this counts down
-        // this is not a big problem since we want to disconnect anyway
-        sleep(Duration::from_secs(120)).await;
-    
-        if voice_state.user_id == ctx.cache.current_user().id {
-            voice_channel = get_channel_info(&ctx, &voice_state).await?;
-        }
-        else {
-            voice_channel = get_channel_info(&ctx, &voice_state_old).await?;
-        }
-    
-        // bot is not connected to any channel via songbird, don't need to do anything
-        // ? could have been removed while sleeping if the song stopped playing 
-        if manager.get(voice_channel.guild_id).is_none() {
-            return None;
-        }
-    
-        match manager.remove(voice_channel.guild_id).await {
-            Ok(()) => {
-                let _ = voice_channel.send_message(ctx.http,
-                    CreateMessage::new()
-                    .content("Disconnected to save bandwidth")
-                ).await;
-            }
-            Err(e) => {
-                let _ = send_error(ctx.http, e.to_string()).await;
-            }
-        }
-    
-        None
-}
-
-pub async fn handle_voice_update(ctx: Context, voice_state_old: VoiceState, voice_state: VoiceState) -> Option<()> {
-    // if the user was disconnected remove Songbird manager so it won't get stuck
-    // Actually this is not really a bug since we can handle disconnect and therefore saving the song queue for example
-    if voice_state.channel_id.is_none() && voice_state.user_id == ctx.cache.current_user().id {
-        let manager = songbird::get(&ctx)
-            .await
-            .expect("Songbird Voice client placed in at initialisation.")
-            .clone();
-    
-        let guild_id = voice_state_old.guild_id?;
-        // bot is not connected to any channel via songbird, don't need to do anything
-        if manager.get(guild_id).is_some() {
-            let _ = manager.remove(guild_id).await;
-            return None;
-        }
-    }
-
-    handle_autodisconnect(ctx, voice_state_old, voice_state).await?;
-    None
-}

src/main.rs

@@ -6,7 +6,6 @@ use std::time::Duration;
 use std::error;
 use std::env;
 
-use serenity::all::VoiceState;
 use serenity::async_trait;
 use serenity::futures::lock::Mutex;
 use serenity::prelude::GatewayIntents;
@@ -20,14 +19,12 @@ use reqwest::Client as HttpClient;
 use dotenv::dotenv;
 
 use songbird::SerenityInit;
-
 use tokio_cron_scheduler::{JobScheduler, Job};
 
 use radiobrowser::RadioBrowserAPI;
 
-mod handlers;
-use handlers::message_handler::handle;
-use handlers::voice_state_handler::handle_voice_update;
+mod message_handler;
+use message_handler::handle;
 
 mod commands;
 mod utils;
@@ -38,7 +35,6 @@ use other::notice;
 mod types;
 use types::{Data, Error};
 
-
 struct Handler;
 
 async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
@@ -57,15 +53,6 @@ async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
 
 #[async_trait]
 impl EventHandler for Handler {
-    async fn voice_state_update(&self, ctx: Context, old: Option<VoiceState>, new: VoiceState) {
-        // User was not connected to any channel and connected to VC
-        let Some(old_channel) = old else {
-            return
-        };
-
-        handle_voice_update(ctx, old_channel, new).await;
-    }
-
     async fn message(&self, ctx: Context, msg: Message) {
         handle(ctx, msg).await;
     }

src/message_handler.rs

@@ -1,5 +1,4 @@
 use rand::random;
-use rand::seq::IndexedRandom;
 use serenity::http::CacheHttp;
 use serenity::{client::Context, http::Http};
 use serenity::model::channel::Message;
@@ -81,8 +80,8 @@ async fn response(http: Arc<Http>, msg: Message) -> bool {
         "Hm?"
     ];
 
-    let response = RESPONSES.choose(&mut rand::rng()).unwrap_or(&"?").to_string();
-    match msg.reply(http.clone(), response).await {
+    let num = random::<usize>() % RESPONSES.len();
+    match msg.reply(http.clone(), RESPONSES[num]).await {
         Ok(_) => { return true }
         Err(e) => {
             let _ = send_error(http, e.to_string()).await;
@@ -94,8 +93,9 @@ async fn response(http: Arc<Http>, msg: Message) -> bool {
 async fn henlo(http: Arc<Http>, msg: Message) -> bool {
     const EMOJIS: [&str; 7] = ["🥰", "🐄", "🐮", "❤️", "👋", "🤠", "😊"];
 
-    let emoji = EMOJIS.choose(&mut rand::rng()).unwrap_or(&"🐮");
-    let response = format!("Henlooo {} {}", msg.author.name, emoji);
+    let num = random::<usize>() % EMOJIS.len();
+    let response = format!("Henlooo {} {}", msg.author.name, EMOJIS[num]);
+
     
     match msg.reply(http.clone(), response).await {
         Ok(_) => { return true }

src/other/notice.rs

@@ -58,7 +58,7 @@ async fn celebrate_birthday(guild_id: GuildId, user_id: UserId, nick: &str, http
         .locale("sk".to_string())
         .search("vsetko najlepsie").await?;
 
-    let index = (rand::random::<u8>() % LIMIT) as usize;
+    let index = rand::random::<usize>() % LIMIT as usize;
     let gif_url = match tenor::get_gif_url(MediaFilter::gif, tenor_response) {
         Ok(urls) => Some(urls),
         Err(e) => {

src/utils/debug.rs

@@ -26,7 +26,6 @@ pub async fn hello(http: Arc<Http>) -> anyhow::Result<()> {
     use serenity::all::ChannelId;
     use anyhow::Context;
     use std::env;
-    use rand::seq::IndexedRandom;
 
     let messages = [
         "AAAAAAAAAAAAAAAAAAAA",
@@ -39,11 +38,11 @@ pub async fn hello(http: Arc<Http>) -> anyhow::Result<()> {
         "Whom'st have summoned the ancient one?",
     ];
 
-    let message =  messages.choose(&mut rand::rng()).unwrap_or(&"Chello").to_string();
+    let num = rand::random::<usize>() % messages.len();
     
     let channel_id: String = env::var("DEBUG_CHANNEL_ID").context("DEBUG_CHANNEL_ID not found in env file")?;
     let channel = ChannelId::new(channel_id.parse::<u64>().unwrap());
-    if let Err(why) = channel.say(http, message).await {
+    if let Err(why) = channel.say(http, messages[num]).await {
         print!("Error sending message: {:?}", why);
     };
 

src/utils/gifs.rs

@@ -1,7 +1,7 @@
 use tenorv2::{tenor, tenor_types::{MediaFilter, TenorError}, JsonValue};
 
 pub async fn get_random_tenor_gif(tenor_response: JsonValue, limit: u8) -> Result<String, TenorError> {
-    let index = (rand::random::<u8>() % limit) as usize;
+    let index = rand::random::<usize>() % limit as usize;
     match tenor::get_gif_url(MediaFilter::gif, tenor_response) {
         Ok(urls) => Ok(urls[index].clone()),
         Err(e) => Err(e)

src/utils/utilities.rs

@@ -1,6 +1,11 @@
 use std::{fs, hash::{DefaultHasher, Hash, Hasher}, io, path::Path, sync::Arc, vec};
 
-use serenity::{all::{ChannelId, ChannelType, Context, CreateMessage, GuildChannel, GuildId, GuildRef, Message, VoiceState}, http::Http};
+use serenity::{all::{ChannelId, ChannelType, CreateMessage, GuildId, GuildRef, Message}, http::Http};
+
+use poise::CreateReply;
+use serenity::async_trait;
+
+use crate::types::Context;
 
 
 pub async fn get_system_channel(guild_id: GuildId, http: &Http) -> anyhow::Result<ChannelId> {
@@ -15,16 +20,6 @@ pub async fn replace_msg(http: Arc<Http>, msg: Message, content: String) -> Resu
     return ChannelId::new(msg.channel_id.get()).send_message(http.clone(), CreateMessage::new().content(content)).await;
 }
 
-pub async fn voice_state_to_guild_channel(ctx: &Context, voice_state: &VoiceState) -> Option<GuildChannel> {
-    let Ok(channel) = voice_state.channel_id?
-        .to_channel(&ctx.http)
-        .await else {
-            return None
-    };
-
-    Some(channel.guild()?)
-}
-
 pub fn get_vc_names(guild: GuildRef) -> Vec<String> {
 
     let mut result: Vec<String> = [].to_vec();