Merge branch 'develop' into fix/web_ui_direct_login_when_auth_disabled

This commit is contained in:
euzu
2025-11-07 19:47:02 +01:00
8 changed files with 35 additions and 34 deletions
+2 -2
View File
@@ -125,7 +125,7 @@ pub fn parse_xtream(input: &ConfigInput,
streams: &Value) -> Result<Option<Vec<PlaylistGroup>>, TuliproxError> {
match map_to_xtream_category(categories) {
Ok(xtream_categories) => {
let input_name = Arc::new(input.name.clone());
let input_name = input.name.clone();
let url = input.url.as_str();
let username = input.username.as_ref().map_or("", |v| v);
let password = input.password.as_ref().map_or("", |v| v);
@@ -173,7 +173,7 @@ pub fn parse_xtream(input: &ConfigInput,
xtream_cluster,
additional_properties: stream.get_additional_properties(),
category_id: 0,
input_name: input_name.to_string(),
input_name: input_name.clone(),
..Default::default()
},
};