.gitignore

@@ -10,4 +10,8 @@
 # IDE config
 .vscode
 
-mooverdb.db*
+mooverdb.db*
+
+*.txt
+
+Cargo.lock

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tenor-v2"]
 	path = tenor-v2
 	url = ssh://git@forgejo.djkato.net:222/HLadislav/tenor-v2.git
+[submodule "radiobrowser-lib-rust"]
+	path = radiobrowser-lib-rust
+	url = ssh://git@forgejo.djkato.net:222/HLadislav/radiobrowser-lib-rust.git

Cargo.toml

@@ -1,33 +1,35 @@
 [package]
 name = "moover_rust"
-version = "3.3.0"
+version = "3.4.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.5"
+rand = "0.9.0"
-anyhow = "1.0.89"
+anyhow = "1.0.95"
 tokio-cron-scheduler = "0.13.0"
 dotenv = "0.15.0"
 poise = "0.6.1"
 serenity = { version = "0.12.4", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "http", "cache"] }
 # serenity_utils = "0.7.0"
-tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread"] }
 regex = "1.11.1"
-chrono = "0.4.38"
+chrono = "0.4.39"
-sqlx = {version="0.8.2", features=["runtime-tokio", "sqlite"]}
+sqlx = {version="0.8.3", features=["runtime-tokio", "sqlite"]}
 form_urlencoded = "1.2.1"
 tenorv2 = { path = "./tenor-v2/tenorv2" }
 # librespot = { version = "0.6.0", default-features = false, features = ["rodio-backend"] }
 songbird = { version = "0.4.6", features = ["driver", "builtin-queue"] }
 reqwest = "0.11.27" # songbird depends on ^0.11
+# radiobrowser = "0.6.1"
+radiobrowser = { path = "./radiobrowser-lib-rust" }
 
 [dependencies.symphonia]
-version = "0.5.2"
+version = "0.5.4"
 features = ["aac", "mp3", "isomp4", "alac"]
 
 [features]
 DEBUG = []
 RELEASE = []
-GUILD_COMMAND = []
+GUILD_COMMAND = []

README.md

@@ -33,3 +33,16 @@ 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

radiobrowser-lib-rust

@@ -0,0 +1 @@
+Subproject commit 0786c897260c7f180917af101ae5ea686cb60c2e

src/commands.rs

@@ -1,11 +1,15 @@
 pub use moover::*;
 pub use notice::*;
 pub use user_interactions::*;
-pub use other::*;
+// pub use other::*;
 pub use voice::*;
+// pub use command_utils::*;
+pub use help::*;
 
 pub mod moover;
 pub mod notice;
 pub mod user_interactions;
-pub mod other;
+// pub mod other;
 pub mod voice;
+// mod command_utils;\
+pub mod help;

src/commands/help.rs

@@ -0,0 +1,38 @@
+use poise::samples::HelpConfiguration;
+
+use crate::types::Context;
+
+type Error = Box<dyn std::error::Error + Send + Sync>;
+
+/// Show help message
+#[poise::command(
+    slash_command,
+    track_edits,
+    category = "Help")
+]
+pub async fn help(
+    ctx: Context<'_>,
+    #[description = "Command to get help for"]
+    #[rest]
+    mut command: Option<String>,
+) -> Result<(), Error> {
+    // This makes it possible to just make `help` a subcommand of any command
+    if ctx.invoked_command_name() != "help" {
+        command = match command {
+            Some(c) => Some(format!("{} {}", ctx.invoked_command_name(), c)),
+            None => Some(ctx.invoked_command_name().to_string()),
+        };
+    }
+    let extra_text_at_bottom = "";
+
+    let config = HelpConfiguration {
+        show_subcommands: true,
+        show_context_menu_commands: true,
+        ephemeral: true,
+        extra_text_at_bottom,
+
+        ..Default::default()
+    };
+    poise::builtins::help(ctx, command.as_deref(), config).await?;
+    Ok(())
+}

src/commands/moover.rs

@@ -1,7 +1,7 @@
 pub use moove::*;
+pub use gif::*;
 pub use say::*;
-// pub use gif::*;
 
 pub mod moove;
+pub mod gif;
 pub mod say;
-// pub mod gif;

src/commands/moover/gif.rs

@@ -0,0 +1,20 @@
+use poise;
+use serenity::all::{Embed, User};
+
+use crate::types::{Context, ContextExt, Error};
+
+#[poise::command(
+    slash_command,
+    description_localized("en-US", "Send a gif from Tenor")
+)]
+pub async fn gif(ctx: Context<'_>,
+    #[description = "What should I search?"]
+    what: String,
+    #[description = "Should the gif be R-rated?"]
+    contentfilter: String
+) -> Result<(), Error> {
+    // let embed;
+    // send_with_embed(ctx, "hug", &title, &desc).await?;
+    ctx.reply_ephemeral("Done!").await?;
+    Ok(())
+}

src/commands/moover/moove.rs

@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use std::time::Duration;
 
 use anyhow::Context;
@@ -6,17 +6,19 @@ use serenity::builder::{CreateAttachment, CreateEmbed, CreateMessage};
 use serenity::http::Http;
 use serenity::model::channel::Message;
 use tokio::time::sleep;
-use regex::Regex;
 use serenity::model::id::ChannelId;
 
+use regex::Regex;
+
+static RE_CHANNEL_ID: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"<#[0-9]*>$").unwrap());
+
 
 /// 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.captures(&msg.content).is_none() {
+    if word_count != 1 || RE_CHANNEL_ID.captures(&msg.content).is_none() {
         return None
     }
 
@@ -49,7 +51,7 @@ pub async fn moove(http: Arc<Http>, msg: Message, m_channel_id: u64) -> anyhow::
         .map(| embed | CreateEmbed::from(embed))
         .collect();
 
-    
+
     let mut new_content = format!("Sent by {}\n mooved {}\n", msg_to_moove.author, msg.author);
     let mut new_msg = CreateMessage::new();
 
@@ -66,7 +68,7 @@ pub async fn moove(http: Arc<Http>, msg: Message, m_channel_id: u64) -> anyhow::
         let embed = CreateEmbed::new()
         .field("MOO", new_content, false)
         .field("Message:\n", msg_to_moove.content.clone(), false);
-    
+
         new_msg = new_msg.add_embed(embed);
     }
 

src/commands/notice.rs

@@ -2,4 +2,4 @@ pub use birthday::*;
 pub use events::*;
 
 pub mod birthday;
-pub mod events;
+pub mod events;

src/commands/user_interactions.rs

@@ -3,4 +3,4 @@ pub use hug::*;
 
 pub mod interaction;
 pub mod headpat;
-pub mod hug;
+pub mod hug;

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::{Error, Context};
+use crate::types::{Context, Error};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Headpat all your friends!")
+    description_localized("en-US", "Headpat all your friends!"),
+    category = "Interaction"
 )]
 pub async fn headpat(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
@@ -15,6 +15,5 @@ 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,11 +2,12 @@ use poise;
 use serenity::all::User;
 
 use super::interaction::send_with_embed;
-use crate::types::{Error, Context};
+use crate::types::{Context, Error};
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Hug all your friends!")
+    description_localized("en-US", "Hug all your friends!"),
+    category = "Interaction"
 )]
 pub async fn hug(ctx: Context<'_>,
     #[description = "Who is the lucky one?"]
@@ -15,6 +16,5 @@ 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 anyhow::anyhow;
+use poise::CreateReply;
-use serenity::all::{Colour, CreateEmbed, CreateMessage};
+use serenity::all::{Colour, CreateEmbed};
 use tenorv2::tenor_builder::Tenor;
 
-use crate::{types::Context, util::{gifs::get_random_tenor_gif, utilities}};
+use crate::{types::Context, utils::gifs::get_random_tenor_gif};
 
 /// Sends embed with random tenor gif from searched query
 /// title and desc are used in the embed
@@ -20,21 +20,7 @@ pub(super) async fn send_with_embed(ctx: Context<'_>, query: &str, title: &str,
         .description(desc)
         .image(url.as_str());
 
-    if ctx.guild_id().is_none() {
+    ctx.send(CreateReply::default().embed(embed)).await?;
-        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(())
 }
-
-pub(super) async fn send(ctx: Context<'_>, msg: &str) -> anyhow::Result<()> {
-    Ok(())
-}

src/commands/voice.rs

@@ -0,0 +1,7 @@
+use voice_utils::*;
+
+mod voice_utils;
+pub mod player_common;
+pub mod radio;
+pub mod general_player;
+pub mod voice_types;

src/commands/voice/general/mod.rs

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

src/commands/voice/general_player.rs

@@ -0,0 +1,49 @@
+use std::vec;
+
+use songbird::input::YoutubeDl;
+use songbird::TrackEvent;
+
+use crate::types::{Context, ContextExt, Error};
+use crate::commands::voice::voice_utils::autocomplete_channel;
+
+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
+)]
+pub async fn play(ctx: Context<'_>,
+    #[autocomplete = "autocomplete_channel"]
+    #[description = "Voice channel name: "]
+    channel: Option<String>,
+    #[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) => {
+            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;
+    }
+    else {
+        ctx.reply_ephemeral("Not in a voice channel").await?;
+        return Ok(())
+    }
+
+    ctx.reply_ephemeral("Done!").await?;
+    Ok(())
+}

src/commands/voice/mod.rs

@@ -1,5 +0,0 @@
-pub mod util;
-pub mod player_common;
-pub mod radio;
-// pub mod spotify;
-pub mod general;

src/commands/voice/player_common.rs

@@ -1,21 +1,26 @@
 use std::vec;
 
+use poise::CreateReply;
 use songbird::input::{File, Input};
+use songbird::TrackEvent;
 
-use crate::util::debug::send_error;
+use crate::utils::debug::send_error;
-use crate::util::poise_context_extension::ContextExt;
+use crate::types::{Context, ContextExt, Error};
-use crate::util::utilities::get_local_songs;
+use crate::utils::utilities::get_local_songs;
-use crate::types::{Context, Error};
 
-use super::util::{connect, autocomplete_channel};
+use super::voice_utils::{connect, autocomplete_channel};
 
-/**
+
+/************************************************************
  * Common commands that are the same for every implementation
- */
+ ************************************************************/
 
+/// Disconnect bot from voice channel
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Disconnect from voice channel")
+    description_localized("en-US", "Disconnect from voice channel"),
+    category = "Voice",
+    guild_only
 )]
 pub async fn disconnect(
     ctx: Context<'_>
@@ -34,7 +39,7 @@ pub async fn disconnect(
     let has_handler = manager.get(guild_id).is_some();
 
     if ! has_handler {
-        ctx.reply("I am not connected to a channel!").await?;
+        ctx.reply_ephemeral("I am not connected to a channel!").await?;
         return Ok(())
     }
 
@@ -50,6 +55,7 @@ pub async fn disconnect(
     }
 }
 
+#[allow(dead_code)]
 async fn autocomplete_song(
     _ctx: Context<'_>,
     partial: &str,
@@ -63,7 +69,9 @@ async fn autocomplete_song(
 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Play song from server storage")
+    description_localized("en-US", "Play song from server storage"),
+    category = "Voice",
+    guild_only
 )]
 pub async fn play_local(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
@@ -73,31 +81,15 @@ pub async fn play_local(ctx: Context<'_>,
     #[description = "Filename of local song: "]
     file_name: String
 ) -> Result<(), Error> {
-
+    let events = vec![TrackEvent::End];
-    if ctx.guild().is_none() {
+    let (manager, guild_id) = match connect(&ctx, channel, events).await {
-        ctx.reply_ephemeral("Can't use this outside of guild").await?;
+        Ok(result) => result,
-        return Ok(());
+        Err(e) => {
-    }
+            ctx.reply_ephemeral(&e.to_string()).await?;
-
+            println!("SONGBIRD MANAGER ERROR: {}", e.to_string());
-    let manager = songbird::get(ctx.serenity_context())
+            return Ok(())
-        .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?;
-                return Ok(())
-            }
         }
-    }
+    };
 
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;
@@ -114,3 +106,46 @@ pub async fn play_local(ctx: Context<'_>,
     ctx.reply_ephemeral("Done!").await?;
     Ok(())
 }
+
+/// 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
+)]
+pub async fn playing(ctx: Context<'_>) -> Result<(), Error> {
+
+    let Some(guild_id) = ctx.guild_id() else {
+        ctx.reply_ephemeral("Guild id not found").await?;
+        return Ok(())
+    };
+
+    let manager = songbird::get(ctx.serenity_context())
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone();
+
+    let Some(_) = manager.get(guild_id) else {
+        ctx.reply_ephemeral("I am not connected to any voice channel right now").await?;
+        return Ok(())
+    };
+
+    let embed = {
+        let mutex_hashmap = ctx.data().playing_info.lock().await;
+        let Some(playing_info) = mutex_hashmap.get(&guild_id) else {
+            ctx.reply_ephemeral("Entry not found, try to reconnect me").await?;
+            return Ok(());
+        };
+
+        playing_info.generate_embed().await    
+    };
+
+    ctx.send(
+        CreateReply::default()
+            .embed(embed)
+    ).await?;
+
+    Ok(())
+}
+

src/commands/voice/radio.rs

@@ -1,3 +1,6 @@
 pub use radio_player::*;
+use radio_utils::*;
 
 pub mod radio_player;
+
+mod radio_utils;

src/commands/voice/radio/radio_player.rs

@@ -1,58 +1,104 @@
 use std::vec;
 
+use poise::ChoiceParameter;
 use reqwest::Client;
 
 use songbird::input::Input;
 use songbird::input::HttpRequest;
+use songbird::TrackEvent;
 
-use crate::commands::util::connect;
+use super::super::connect;
-use crate::util::poise_context_extension::ContextExt;
+use super::link_or_string;
-use crate::types::{Context, Error};
+use super::LinkString;
-use crate::commands::voice::util::autocomplete_channel;
+use super::parse_radio_autocomplete;
+use super::radio_utils::paginate_search_stations;
+use super::super::voice_utils::MAX_ENTRIES;
 
-// TODO: autocomplete radio stream URLs
+use crate::commands::voice_types::{NumberOfEntries, PlayingInfoType};
+use crate::types::{Context, Error, ContextExt};
+use crate::commands::voice::voice_utils::autocomplete_channel;
+
+/// Plays online radio stream 
 #[poise::command(
     slash_command,
-    description_localized("en-US", "Plays music from URL source")
+    description_localized("en-US", "Plays music from URL source"),
+    subcommands("search", "play"),
+    guild_only
 )]
-pub async fn radio(ctx: Context<'_>,
+pub async fn radio(_ctx: Context<'_>) -> Result<(), Error> {
+    Ok(())
+}
+
+/// 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"
+)]
+pub async fn play(ctx: Context<'_>,
     #[autocomplete = "autocomplete_channel"]
     #[description = "Voice channel name: "]
     channel: Option<String>,
-    #[description = "Source URL: "]
+    #[autocomplete = "autocomplete_radio"]
-    url: String,
+    #[description = "Radio station: "]
+    name: String,
 ) -> Result<(), Error> {
+    let api = &ctx.data().radio_browser;
+    
+    let stations_result = match link_or_string(&name) {
+        LinkString::Link => {            
+            if name.ends_with(".m3u") {
+                ctx.reply_ephemeral("Sorry, currently I don't support m3u files").await?;
+                return Ok(());
+            }
 
-    if ctx.guild().is_none() {
+            api.get_stations().byurl(name).await
-        ctx.reply_ephemeral("Can't use this outside of guild").await?;
+        },
-        return Ok(());
+        LinkString::String => {
-    }
+            let (name, country, language) = match parse_radio_autocomplete(&name) {
+                Some(tuple) => tuple,
+                None => {
+                    ctx.reply_ephemeral("Please use either direct URL or provided autocomplete").await?;
+                    return Ok(())
+                }
+            };
 
-    let manager = songbird::get(ctx.serenity_context())
+            api.get_stations()
-        .await
+                .name_exact(true)
-        .expect("Songbird Voice client placed in at initialisation.")
+                .name(name)
-        .clone();
+                .country_exact(true)
+                .country(country)
+                .language_exact(true)
+                .language(language)
+                .send().await
+        }
+    };
 
-    let Some(guild_id) = ctx.guild_id() else {
+    let Ok(stations) = stations_result else {
-        ctx.reply_ephemeral("Guild id not found").await?;
+        ctx.reply_ephemeral("There was an error with radio API!").await?;
         return Ok(())
     };
 
-    if manager.get(guild_id).is_none() {
+    let Some(station) = stations.first() else {
-        match connect(&ctx, guild_id, channel).await {
+        ctx.reply_ephemeral("Radio station not found!").await?;
-            Ok(_) => (),
+        return Ok(())
-            Err(e) => {
+    };
-                ctx.reply_ephemeral(&e.to_string()).await?;
+
-                return Ok(())
+    let events = vec![TrackEvent::End];
-            }
+    let (manager, guild_id) = match connect(&ctx, channel, events).await {
+        Ok(result) => result,
+        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;
 
         let client = Client::new();
-        let request = HttpRequest::new(client, url);
+        let request = HttpRequest::new(client, station.url.clone());
         let input = Input::from(request);
         handler.play_only_input(input);
     }
@@ -61,6 +107,67 @@ pub async fn radio(ctx: Context<'_>,
         return Ok(())
     }
 
+    {
+        let mut hash_map = ctx.data().playing_info.lock().await;
+        hash_map.insert(guild_id, PlayingInfoType::RadioInfo(station.clone()));
+    }
+
     ctx.reply_ephemeral("Done!").await?;
     Ok(())
 }
+
+async fn autocomplete_radio(
+    ctx: Context<'_>,
+    partial: &str
+) -> Vec<String> {
+    
+    let api = &ctx.data().radio_browser;
+
+    let stations: Vec<String> = match api.get_stations()
+        .limit(MAX_ENTRIES)
+        .name(partial)
+        .hidebroken(true)
+        .send().await {
+            Ok(stations) => {
+                stations.iter().map(|station: &radiobrowser::ApiStation| 
+                    format!("Name: {} Country: {} Language: {}", station.name, station.country, station.language)
+                ).collect()
+            },
+            Err(_) => return vec!["".to_owned()]
+    };
+
+    return stations
+}
+
+/// 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"
+)]
+pub async fn search(ctx: Context<'_>,
+    #[description = "Radio station: "]
+    name: String,
+    #[description = "Country: "]
+    country: Option<String>,
+    #[description = "Tag: "]
+    tag: Option<String>,
+    #[description = "Number of entries on page: "]
+    entries: Option<NumberOfEntries>
+) -> Result<(), Error> {
+
+    let api = &ctx.data().radio_browser;    
+
+    let entries = entries.unwrap_or(NumberOfEntries::Ten);
+
+    let search_builder = api.get_stations()
+        .limit(entries.name())
+        .name(name)
+        .tag(tag.unwrap_or("".to_owned()))
+        .country(country.unwrap_or("".to_owned()))
+        .hidebroken(true);
+
+    paginate_search_stations(&ctx, &search_builder, entries).await?;
+
+    Ok(())
+}

src/commands/voice/radio/radio_utils.rs

@@ -0,0 +1,141 @@
+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}};
+
+pub async fn paginate_search_stations(
+    ctx: &Context<'_>,
+    search_builder: &StationSearchBuilder,
+    limit: NumberOfEntries
+) -> Result<(), Error> {
+    // Define some unique identifiers for the navigation buttons
+    let ctx_id = ctx.id();
+    let prev_button_id = format!("{}prev", ctx_id);
+    let next_button_id = format!("{}next", ctx_id);
+
+    let search_builder = search_builder;
+
+    let Ok(stations) = search_builder.clone().send().await else {
+        ctx.reply_ephemeral("Something went wrong, try searching again").await?;
+        return Ok(())
+    };
+
+    let mut page = 0;
+
+    let embed = create_station_list_embed(&stations, page);
+
+    // Send the embed with the first page as content
+    let reply = {
+        let components = CreateActionRow::Buttons(vec![
+            CreateButton::new(&prev_button_id).emoji('◀'),
+            CreateButton::new(&next_button_id).emoji('▶'),
+            ]);
+
+            CreateReply::default()
+            .embed(embed)
+            .components(vec![components])
+        };
+
+        ctx.send(reply).await?;
+
+        // Loop through incoming interactions with the navigation buttons
+        let mut offset = 0;
+        let limit_int = limit as u32;
+        while let Some(press) = serenity::collector::ComponentInteractionCollector::new(ctx)
+        // We defined our button IDs to start with `ctx_id`. If they don't, some other command's
+        // button was pressed
+        .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
+        // Timeout when no navigation button has been pressed for 24 hours
+        .timeout(std::time::Duration::from_secs(3600 * 24))
+        .await
+        {
+            // Depending on which button was pressed, go to next or previous page
+        if press.data.custom_id == next_button_id {
+            offset += limit_int;
+            page += 1;
+        } else if press.data.custom_id == prev_button_id {
+            offset = if offset < limit_int { offset } else { offset - limit_int };
+            page = if page == 0 { 0 } else { page - 1 };
+        } else {
+            // This is an unrelated button interaction
+            continue;
+        }
+
+        let Ok(mut stations) = search_builder.clone().offset(offset.to_string()).send().await else {
+            ctx.reply_ephemeral("Something went wrong, try searching again").await?;
+            return Ok(())
+        };
+
+        if stations.is_empty() {
+            offset = 0;
+            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?;
+                return Ok(())
+            };
+            stations = new_stations;
+        }
+
+        let embed = create_station_list_embed(&stations, page);
+
+        // Update the message with the new page contents
+        press
+        .create_response(
+            ctx.serenity_context(),
+            CreateInteractionResponse::UpdateMessage(
+                CreateInteractionResponseMessage::new()
+                .embed(embed),
+            ),
+        )
+        .await?;
+}
+
+Ok(())
+}
+
+fn create_station_list_embed(stations: &Vec<ApiStation>, page: u32) -> CreateEmbed {
+    let result = CreateEmbed::new()
+        .fields(
+            stations.iter().map(|station| {
+                (
+                    station.name.clone(),
+                    format!("Country: {} Stream: {}",
+                    station.country, station.url),
+                    false        
+                )
+            })
+        )
+        .footer(CreateEmbedFooter::new(format!("Page: {}", page + 1)));
+
+    result
+}
+
+pub enum LinkString {
+    Link,
+    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 }
+}
+
+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 {
+        return None
+    };
+
+    return Some((
+        String::from(&captures[1]),
+        String::from(&captures[2]),
+        String::from(&captures[3])
+    ))
+}

src/commands/voice/util.rs

@@ -1,76 +0,0 @@
-use serenity::all::{ChannelId, GuildId};
-use serenity::async_trait;
-
-use songbird::events::{Event, EventContext, EventHandler as VoiceEventHandler};
-use songbird::TrackEvent;
-
-use crate::{types::{Context, Error}, util::utilities::get_channel_by_name};
-
-/// Returns either voice channel to which the user is currently connected to or the one passed via name
-async fn get_voice_channel(ctx: &Context<'_>, name: Option<String>) -> Result<ChannelId, String> {
-    if name.is_none() || name.as_ref().is_some_and(|n| n.is_empty()) {
-        match ctx.guild().and_then(|guild|
-            guild.voice_states.get(&ctx.author().id).and_then(|voice_state|
-                voice_state.channel_id
-        ) 
-        ) {
-            Some(c) => Ok(c),
-            None => Err("You must be in a voice channel or specify explicit voice channel by name".to_string())
-        }
-    }
-    else {
-        match ctx.guild().and_then(|guild|
-            get_channel_by_name(guild, name.unwrap()) 
-        ) {
-            Some(c) => Ok(c),
-            None => Err("Channel with this name does not exist".to_string())
-        }
-    }
-}
-
-struct TrackErrorNotifier;
-
-#[async_trait]
-impl VoiceEventHandler for TrackErrorNotifier {
-    async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
-        if let EventContext::Track(track_list) = ctx {
-            for (state, handle) in *track_list {
-                println!(
-                    "Track {:?} encountered an error: {:?}",
-                    handle.uuid(),
-                    state.playing
-                );
-            }
-        }
-
-        None
-    }
-}
-
-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())
-        .await
-        .expect("Songbird Voice client placed in at initialisation.")
-        .clone();
-
-    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);
-    }
-
-    Ok(())
-}
-
-pub async fn autocomplete_channel(
-    ctx: Context<'_>,
-    _partial: &str,
-) -> Vec<String> {
-
-    use crate::util::utilities::get_vc_names;
-    match ctx.guild() {
-        Some(guild) => get_vc_names(guild),
-        None => [].to_vec()
-    }
-}

src/commands/voice/voice_types.rs

@@ -0,0 +1,90 @@
+use poise::ChoiceParameter;
+use radiobrowser::ApiStation;
+use serenity::{all::CreateEmbed, async_trait};
+
+use crate::utils::utilities::hash_to_u32;
+
+#[derive(ChoiceParameter, Debug)]
+pub enum NumberOfEntries {
+    #[name = "5"]
+    Five = 5,
+    #[name = "10"]
+    Ten = 10,
+    #[name = "15"]
+    Fifteen = 15
+}
+
+#[async_trait]
+pub trait GenerateEmbed {
+    async fn generate_embed(&self) -> CreateEmbed;
+}
+
+#[allow(dead_code)]
+pub struct SpotifyInfo {
+    pub name: String,
+    pub interpret: String,
+    // client
+    pub duration: String,
+}
+
+#[allow(dead_code)]
+pub struct GeneralInfo {
+    pub name: String,
+    pub site: String,
+    // client
+    pub duration: Option<String>
+}
+
+#[async_trait]
+impl GenerateEmbed for GeneralInfo {
+    async fn generate_embed(&self) -> CreateEmbed {
+        CreateEmbed::new()
+    }
+}
+
+#[async_trait]
+impl GenerateEmbed for SpotifyInfo {
+    async fn generate_embed(&self) -> CreateEmbed {
+        CreateEmbed::new()
+    }
+}
+
+#[async_trait]
+impl GenerateEmbed for ApiStation {
+    async fn generate_embed(&self) -> CreateEmbed {
+        let embed= CreateEmbed::new()
+            .title("Current station:")
+            .thumbnail(&self.favicon)
+            .field("Name:", &self.name, true)
+            .field("Country:", &self.country, true)
+            .field("Language:", &self.language, true)
+            .field("Website:", &self.homepage, true)
+            .field("Stream:", &self.url, true)
+            .field("Tags:", &self.tags, false)
+            .color(hash_to_u32(&self.stationuuid));
+
+        embed
+    }
+}
+
+// pub struct PlayingInfo<T> {
+//     pub data: T,
+//     pub create_embed: Box<dyn Fn(T) -> CreateEmbed + Send + Sync>
+// }
+
+#[allow(dead_code)]
+pub enum PlayingInfoType {
+    SpotifyInfo(SpotifyInfo),
+    RadioInfo(ApiStation),
+    GeneralInfo(GeneralInfo)
+}
+
+impl PlayingInfoType {
+    pub async fn generate_embed(&self) -> CreateEmbed {
+        match self {
+            PlayingInfoType::SpotifyInfo(v) => v.generate_embed().await,
+            PlayingInfoType::RadioInfo(v) => v.generate_embed().await,
+            PlayingInfoType::GeneralInfo(v) => v.generate_embed().await
+        }
+    }
+}

src/commands/voice/voice_utils.rs

@@ -0,0 +1,170 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use serenity::all::{CacheHttp, ChannelId, CreateMessage, GuildId};
+use serenity::async_trait;
+
+use songbird::events::{Event, EventContext, EventHandler as VoiceEventHandler};
+use songbird::{Songbird, TrackEvent};
+use tokio::time::sleep;
+
+use crate::{types::Context, utils::utilities::get_channel_by_name};
+
+pub const MAX_ENTRIES: &str = "15";
+
+/// Returns either voice channel to which the user is currently connected to or the one passed via name
+async fn get_voice_channel(ctx: &Context<'_>, name: Option<String>) -> Result<ChannelId, String> {
+    if name.is_none() || name.as_ref().is_some_and(|n| n.is_empty()) {
+        match ctx.guild().and_then(|guild|
+            guild.voice_states.get(&ctx.author().id).and_then(|voice_state|
+                voice_state.channel_id
+        ) 
+        ) {
+            Some(c) => Ok(c),
+            None => Err("You must be in a voice channel or specify explicit voice channel by name".to_string())
+        }
+    }
+    else {
+        match ctx.guild().and_then(|guild|
+            get_channel_by_name(guild, name.unwrap()) 
+        ) {
+            Some(c) => Ok(c),
+            None => Err("Channel with this name does not exist".to_string())
+        }
+    }
+}
+
+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
+        }
+    }
+}
+
+#[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)
+                };
+            }
+        }
+
+        None
+    }
+}
+
+
+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())
+    };
+
+    let voice_channel = get_voice_channel(&ctx, channel).await?;
+
+    let manager = songbird::get(ctx.serenity_context())
+        .await
+        .expect("Songbird Voice client placed in at initialisation.")
+        .clone();
+
+    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
+                )
+            );
+        }
+    }
+
+    Ok((manager, guild_id))
+}
+
+pub async fn autocomplete_channel(
+    ctx: Context<'_>,
+    _partial: &str,
+) -> Vec<String> {
+
+    use crate::utils::utilities::get_vc_names;
+    match ctx.guild() {
+        Some(guild) => get_vc_names(guild),
+        None => [].to_vec()
+    }
+}

src/commands/voice/yt.rs

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

src/commands/voice/yt/yt_player.rs

@@ -1,21 +1,21 @@
 use std::vec;
+use std::env;
 
 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(
     slash_command,
-    description_localized("en-US", "Plays music from supported URL")
+    description_localized("en-US", "Plays music from YouTube URL")
 )]
-pub async fn play(ctx: Context<'_>,
+pub async fn play_yt(ctx: Context<'_>,
-    #[autocomplete = "autocomplete_channel"]
     #[description = "Voice channel name: "]
-    channel: Option<String>,
+    #[channel_types("Voice")]
+    channel: Option<GuildChannel>,
     #[description = "Source URL: "]
     url: String,
 ) -> Result<(), Error> {
@@ -35,7 +35,7 @@ pub async fn play(ctx: Context<'_>,
         return Ok(())
     };
 
-    let http_client = &ctx.data().http_client;
+    let http_client = ctx.data().http_client.clone();
 
     if manager.get(guild_id).is_none() {
         match connect(&ctx, guild_id, channel).await {
@@ -50,7 +50,31 @@ pub async fn play(ctx: Context<'_>,
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;
 
-        let src = YoutubeDl::new(http_client.clone(), url);
+        let cookies_path = match env::var("COOKIES") {
+            Ok(path) => path,
+            Err(e) => {
+                let _ = ctx.reply_ephemeral("There was an error (did not find cookies)").await;
+                dbg!(e);
+                return Ok(());
+            }
+        };
+
+        let po_token = match env::var("PO_TOKEN") {
+            Ok(token) => token,
+            Err(e) => {
+                let _ = ctx.reply_ephemeral("There was an error (did not find token)").await;
+                dbg!(e);
+                return Ok(());
+            }
+        };
+
+        let arguments: Vec<String> = vec![
+            "--extractor-args".into(),
+            format!("youtube:player-client=web,default;po_token=web+{po_token}"),
+            "--cookies".into(),
+            cookies_path
+        ];
+        let src = YoutubeDl::new(http_client, url).user_args(arguments);
         handler.enqueue_input(src.into()).await;
     }
     else {

src/handlers.rs

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

src/handlers/message_handler.rs

@@ -1,12 +1,13 @@
 use rand::random;
+use rand::seq::IndexedRandom;
 use serenity::http::CacheHttp;
 use serenity::{client::Context, http::Http};
 use serenity::model::channel::Message;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use crate::util::debug::send_error;
+use crate::utils::debug::send_error;
-use crate::util::utilities;
+use crate::utils::utilities;
 
 use crate::commands::moover::moove::{moove, moove_check};
 
@@ -14,7 +15,7 @@ pub async fn handle(ctx: Context, msg: Message) {
     if msg.author.bot {
         return
     }
-    
+
     let lower_case_content = msg.content.to_lowercase();
 
     let bot_id = ctx.cache.current_user().id;
@@ -30,7 +31,7 @@ pub async fn handle(ctx: Context, msg: Message) {
             return
         }
     }
-    
+
     // X and IG not embedding correctly (IG fix does not work for now need to find different one)
     let link_fixes = HashMap::from([
         ("//x.com", "//fixvx.com")
@@ -80,8 +81,8 @@ async fn response(http: Arc<Http>, msg: Message) -> bool {
         "Hm?"
     ];
 
-    let num = random::<usize>() % RESPONSES.len();
+    let response = RESPONSES.choose(&mut rand::rng()).unwrap_or(&"?").to_string();
-    match msg.reply(http.clone(), RESPONSES[num]).await {
+    match msg.reply(http.clone(), response).await {
         Ok(_) => { return true }
         Err(e) => {
             let _ = send_error(http, e.to_string()).await;
@@ -93,10 +94,9 @@ async fn response(http: Arc<Http>, msg: Message) -> bool {
 async fn henlo(http: Arc<Http>, msg: Message) -> bool {
     const EMOJIS: [&str; 7] = ["🥰", "🐄", "🐮", "❤️", "👋", "🤠", "😊"];
 
-    let num = random::<usize>() % EMOJIS.len();
+    let emoji = EMOJIS.choose(&mut rand::rng()).unwrap_or(&"🐮");
-    let response = format!("Henlooo {} {}", msg.author.name, EMOJIS[num]);
+    let response = format!("Henlooo {} {}", msg.author.name, emoji);
 
-    
     match msg.reply(http.clone(), response).await {
         Ok(_) => { return true }
         Err(e) => {

src/handlers/voice_state_handler.rs

@@ -0,0 +1,110 @@
+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

@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -5,7 +6,9 @@ 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;
 use serenity::client::Context;
 use serenity::model::gateway::Ready;
@@ -17,13 +20,17 @@ use reqwest::Client as HttpClient;
 use dotenv::dotenv;
 
 use songbird::SerenityInit;
+
 use tokio_cron_scheduler::{JobScheduler, Job};
 
-mod message_handler;
+use radiobrowser::RadioBrowserAPI;
-use message_handler::handle;
+
+mod handlers;
+use handlers::message_handler::handle;
+use handlers::voice_state_handler::handle_voice_update;
 
 mod commands;
-mod util;
+mod utils;
 
 mod other;
 use other::notice;
@@ -31,6 +38,7 @@ use other::notice;
 mod types;
 use types::{Data, Error};
 
+
 struct Handler;
 
 async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
@@ -49,15 +57,24 @@ 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;
     }
 
     async fn ready(&self, ctx: Context, ready: Ready) {
-        println!("{} v3.3.0 is connected!", ready.user.name);
+        println!("{} v{} is connected!", ready.user.name, option_env!("CARGO_PKG_VERSION").unwrap_or(""));
 
         #[cfg(feature="RELEASE")] {
-            use util::debug::hello;
+            use utils::debug::hello;
             let _ = hello(ctx.http.clone()).await;
         }
 
@@ -87,9 +104,11 @@ async fn main() -> anyhow::Result<()> {
             commands::say(),
             commands::hug(),
             // commands::player::play_local(),
-            commands::player_common::disconnect(),
             commands::radio::radio(),
-            commands::general::play()
+            commands::general_player::play(),
+            commands::player_common::disconnect(),
+            commands::player_common::playing(),
+            commands::help(),
         ],
         prefix_options: poise::PrefixFrameworkOptions {
             prefix: Some("/".into()),
@@ -107,11 +126,11 @@ async fn main() -> anyhow::Result<()> {
         ..Default::default()
     };
 
-    
+
     let framework = poise::Framework::builder()
     .setup(move |ctx, _ready, framework| {
         Box::pin(async move {
-            
+
             #[cfg(feature="GUILD_COMMAND")] {
                 use poise::samples::register_in_guild;
                 use serenity::all::GuildId;
@@ -119,7 +138,7 @@ async fn main() -> anyhow::Result<()> {
                 let debug_guild_id = env::var("DEBUG_GUILD_ID")
                     .context("DEBUG_GUILD_ID not found in env")?
                     .parse::<u64>().unwrap();
-            
+
                 register_in_guild(ctx, &framework.options().commands, GuildId::new(debug_guild_id)).await?;
             }
 
@@ -128,8 +147,11 @@ async fn main() -> anyhow::Result<()> {
                 register_globally(ctx, &framework.options().commands).await?;
             }
 
+
             Ok(Data {
-                http_client: HttpClient::new()
+                http_client: HttpClient::new(),
+                radio_browser: RadioBrowserAPI::new().await?,
+                playing_info: Mutex::new(HashMap::new())
                 })
             })
         })

src/other/notice.rs

@@ -6,8 +6,8 @@ use serenity::{all::{GuildId, UserId}, builder::{CreateEmbed, CreateMessage}, cl
 
 use sqlx::{Connection, FromRow, SqliteConnection};
 
-use crate::util::debug::send_error;
+use crate::utils::debug::send_error;
-use crate::util::utilities;
+use crate::utils::utilities;
 
 use std::{env, sync::Arc};
 
@@ -26,13 +26,13 @@ pub async fn notice_wrapper(ctx: Context) {
 
 /// Send embed with event name and optional special message to guild's general channel
 async fn announce_event(guild_id: GuildId, name: &str, special_message: &str, http: Arc<Http>) -> anyhow::Result<()> {
-   
+
     let mut event_embed = CreateEmbed::new()
         .color(Colour::new(rand::random::<u32>() % 0xFFFFFF))
         .title("Today's event is:");
 
     let system_channel = utilities::get_system_channel(guild_id, &http).await?;
-    
+
     if special_message.contains("http") {
         event_embed = event_embed.description(name);
         system_channel.send_message(http.clone(),
@@ -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::<usize>() % LIMIT as usize;
+    let index = (rand::random::<u8>() % LIMIT) as usize;
     let gif_url = match tenor::get_gif_url(MediaFilter::gif, tenor_response) {
         Ok(urls) => Some(urls),
         Err(e) => {

src/types.rs

@@ -1,28 +1,37 @@
-// pub struct Data {}
+use std::collections::HashMap;
-
-use std::{ffi::OsString, path::PathBuf};
-
-use serenity::prelude::TypeMapKey;
 
+use poise::CreateReply;
+use radiobrowser::RadioBrowserAPI;
 use reqwest::Client as HttpClient;
+use serenity::{all::{futures::lock::Mutex, GuildId}, async_trait};
+
+use crate::commands::voice_types::PlayingInfoType;
 
 // TODO: this should be probably expanded also to be used by multiple servers and commands
 // radio and spotify commands always create new HttpClient
-pub struct HttpKey;
-
-impl TypeMapKey for HttpKey {
-    type Value = HttpClient;
-}
-
 pub struct Data {
     pub http_client: HttpClient,
+    pub radio_browser: RadioBrowserAPI,
+    pub playing_info: Mutex<HashMap<GuildId, PlayingInfoType>>
 }
 
 pub type Error = Box<dyn std::error::Error + Send + Sync>;
 // replace () with Data if you ever need to store some additional data
 pub type Context<'a> = poise::Context<'a, Data, Error>;
 
-pub struct Track {
+/// Trait to extend `Context` with additional methods.
-    pub path: PathBuf,
+#[async_trait]
-    pub name: OsString,
+pub trait ContextExt {
+    async fn reply_ephemeral(&self, content: &str) -> anyhow::Result<()>;
+}
+
+#[async_trait]
+impl ContextExt for Context<'_> {
+    async fn reply_ephemeral(&self, content: &str) -> anyhow::Result<()> {
+        self.send(CreateReply::default()
+            .ephemeral(true)
+            .content(content)
+        ).await?;
+        Ok(())
+    }
 }

src/util/poise_context_extension.rs

@@ -1,22 +0,0 @@
-use poise::CreateReply;
-use serenity::async_trait;
-
-use crate::types::Context;
-
-
-/// Trait to extend `Context` with additional methods.
-#[async_trait]
-pub trait ContextExt {
-    async fn reply_ephemeral(&self, content: &str) -> anyhow::Result<()>;
-}
-
-#[async_trait]
-impl ContextExt for Context<'_> {
-    async fn reply_ephemeral(&self, content: &str) -> anyhow::Result<()> {
-        self.send(CreateReply::default()
-            .ephemeral(true)
-            .content(content)
-        ).await?;
-        Ok(())
-    }
-}

src/utils.rs

@@ -1,4 +1,5 @@
+pub use utilities::*;
+
 pub mod debug;
 pub mod utilities;
 pub mod gifs;
-pub mod poise_context_extension;

src/utils/debug.rs

@@ -4,13 +4,13 @@ use serenity::http::Http;
 
 pub async fn send_error(_http: Arc<Http>, msg: String) -> anyhow::Result<()> {
     println!("ERROR: {msg}");
-    
+
     #[cfg(feature="RELEASE")] {
         use serenity::all::ChannelId;
         use std::process::exit;
         use std::env;
         use anyhow::Context;
-        
+
         let channel_id: String = env::var("DEBUG_CHANNEL_ID").context("DEBUG_CHANNEL_ID not found in env file")?;
         match ChannelId::new(channel_id.parse::<u64>().unwrap())
             .say(_http, msg).await {
@@ -20,12 +20,13 @@ pub async fn send_error(_http: Arc<Http>, msg: String) -> anyhow::Result<()> {
     }
     Ok(())
 }
-    
+
 #[cfg(feature="RELEASE")]
 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",
@@ -38,11 +39,11 @@ pub async fn hello(http: Arc<Http>) -> anyhow::Result<()> {
         "Whom'st have summoned the ancient one?",
     ];
 
-    let num = rand::random::<usize>() % messages.len();
+    let message =  messages.choose(&mut rand::rng()).unwrap_or(&"Chello").to_string();
-    
+
     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, messages[num]).await {
+    if let Err(why) = channel.say(http, message).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::<usize>() % limit as usize;
+    let index = (rand::random::<u8>() % 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,7 @@
-use std::{fs, io, path::Path, sync::Arc, vec};
+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};
 
 pub async fn get_system_channel(guild_id: GuildId, http: &Http) -> anyhow::Result<ChannelId> {
     use anyhow::Context;
@@ -14,6 +15,16 @@ 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();
@@ -58,3 +69,10 @@ pub fn get_local_songs(partial: &str) -> io::Result<Vec<String>> {
 
     Ok(result)
 }
+
+pub fn hash_to_u32<T: Hash>(from: &T) -> u32 {
+    let mut hasher = DefaultHasher::new();
+    from.hash(&mut hasher);
+    let hash_val = hasher.finish();
+    (hash_val & 0xFFFFFF) as u32
+}

tenor-v2

@@ -1 +1 @@
-Subproject commit fd8c8bde1be41116fe398776c45625a19ec10281
+Subproject commit 66cf5cc388af947846caf5b7118257df01d60725