diff --git a/backend/src/model/config/input.rs b/backend/src/model/config/input.rs index 22478576f..8c7df8cae 100644 --- a/backend/src/model/config/input.rs +++ b/backend/src/model/config/input.rs @@ -150,7 +150,8 @@ impl ConfigInput { let mut aliases: Vec = batch_aliases.into_iter() .map(ConfigInputAlias::from) .collect(); - if let Some(mut first) = aliases.remove(0) { + if !aliases.is_empty() { + let mut first = aliases.remove(0); self.username = first.username.take(); self.password = first.password.take(); self.url = first.url.trim().to_string(); @@ -221,7 +222,7 @@ impl fmt::Display for ConfigInput { pub fn get_batch_aliases(input_type: InputType, url: &str) -> Result)>, TuliproxError> { if input_type == InputType::M3uBatch || input_type == InputType::XtreamBatch { return match utils::csv_read_inputs(input_type, url) { - Ok((file_path, mut batch_aliases)) => { + Ok((file_path, batch_aliases)) => { Ok(Some((file_path, batch_aliases))) } Err(err) => { diff --git a/shared/src/model/config/input.rs b/shared/src/model/config/input.rs index 09da6d2f0..a40f2f9e9 100644 --- a/shared/src/model/config/input.rs +++ b/shared/src/model/config/input.rs @@ -278,7 +278,7 @@ impl ConfigInputDto { Ok(()) } - pub fn prepare_batch(&mut self, mut batch_aliases: Vec) { + pub fn prepare_batch(&mut self, batch_aliases: Vec) { apply_batch_aliases!(self, batch_aliases); } } diff --git a/shared/src/model/web_socket.rs b/shared/src/model/web_socket.rs index 22c70385f..f155787b2 100644 --- a/shared/src/model/web_socket.rs +++ b/shared/src/model/web_socket.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; pub const PROTOCOL_VERSION: u8 = 1; -#[derive(Default)] +#[derive(Default, PartialOrd, PartialEq, Debug, Clone)] pub enum UserRole { #[default] Unauthorized,