From 695a77950fe1c0aa2234b01af4d09b8edfde8cfb Mon Sep 17 00:00:00 2001 From: Ladislav Hano Date: Sun, 26 Jan 2025 22:47:06 +0100 Subject: [PATCH] chore: cleaned the code a bit --- src/commands/user_interactions/interaction.rs | 4 --- src/commands/voice/player_common.rs | 1 + src/commands/voice/radio/radio_player.rs | 29 ++++--------------- src/commands/voice/radio/radio_utils.rs | 1 - 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/commands/user_interactions/interaction.rs b/src/commands/user_interactions/interaction.rs index f495f3e..d53002e 100644 --- a/src/commands/user_interactions/interaction.rs +++ b/src/commands/user_interactions/interaction.rs @@ -34,7 +34,3 @@ pub(super) async fn send_with_embed(ctx: Context<'_>, query: &str, title: &str, Ok(()) } - -pub(super) async fn send(ctx: Context<'_>, msg: &str) -> anyhow::Result<()> { - Ok(()) -} \ No newline at end of file diff --git a/src/commands/voice/player_common.rs b/src/commands/voice/player_common.rs index 8eee740..ed92390 100644 --- a/src/commands/voice/player_common.rs +++ b/src/commands/voice/player_common.rs @@ -50,6 +50,7 @@ pub async fn disconnect( } } +#[allow(dead_code)] async fn autocomplete_song( _ctx: Context<'_>, partial: &str, diff --git a/src/commands/voice/radio/radio_player.rs b/src/commands/voice/radio/radio_player.rs index f669429..f33b54a 100644 --- a/src/commands/voice/radio/radio_player.rs +++ b/src/commands/voice/radio/radio_player.rs @@ -8,18 +8,15 @@ use songbird::input::HttpRequest; use super::super::connect; use super::link_or_string; -use super::parse_radio_autocomplete; use super::LinkString; -use crate::commands::voice_types::NumberOfEntries; -use crate::commands::voice_types::PlayingInfoType; -use crate::types::ContextExt; -use crate::types::{Context, Error}; -use crate::commands::voice::voice_utils::autocomplete_channel; - +use super::parse_radio_autocomplete; use super::radio_utils::paginate_search_stations; - use super::super::voice_utils::MAX_ENTRIES; +use crate::commands::voice_types::{NumberOfEntries, PlayingInfoType}; +use crate::types::{Context, Error, ContextExt}; +use crate::commands::voice::voice_utils::autocomplete_channel; + #[poise::command( slash_command, description_localized("en-US", "Plays music from URL source"), @@ -29,9 +26,6 @@ pub async fn radio(_ctx: Context<'_>) -> Result<(), Error> { Ok(()) } -// TODO: deduplicate you use a lot of the same code - -// TODO: autocomplete radio stream URLs #[poise::command( slash_command, description_localized("en-US", "Plays music from URL source") @@ -151,22 +145,9 @@ async fn autocomplete_radio( Err(_) => return vec!["".to_owned()] }; - // dbg!(&stations); - return stations - // return vec![]; } -// TODO -// autocomplete -// search with buttons and list in embed with direct links to stream -// embed showing currently playing song - -// use trace::trace; -// trace::init_depth_var!(); - -// TODO: autocomplete radio stream URLs -// #[trace] #[poise::command( slash_command, description_localized("en-US", "Search for a radio") diff --git a/src/commands/voice/radio/radio_utils.rs b/src/commands/voice/radio/radio_utils.rs index 9889928..c207dfc 100644 --- a/src/commands/voice/radio/radio_utils.rs +++ b/src/commands/voice/radio/radio_utils.rs @@ -118,7 +118,6 @@ pub enum LinkString { String } - pub fn link_or_string(haystack: &str) -> LinkString { let Ok(re) = Regex::new(r"^https?://([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$") else { panic!("Wrong regex expression!");