status changes

This commit is contained in:
Simon
2026-03-21 19:29:30 +00:00
parent cecc1f994b
commit 9bba981796
12 changed files with 41 additions and 22 deletions

View File

@@ -25,7 +25,7 @@ use wreq::Version;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "amateur-homemade", group_id: "chinese",
tags: &["amateur", "chinese", "homemade"], tags: &["amateur", "chinese", "homemade"],
}; };

View File

@@ -19,7 +19,7 @@ use wreq::Version;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "asian-jav", group_id: "jav",
tags: &["jav", "asian", "streaming"], tags: &["jav", "asian", "streaming"],
}; };

View File

@@ -18,7 +18,7 @@ use wreq::Version;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "asian-jav", group_id: "jav",
tags: &["jav", "asian", "uncensored"], tags: &["jav", "asian", "uncensored"],
}; };

View File

@@ -397,10 +397,12 @@ fn channel_group_title(group_id: &str) -> &'static str {
"mainstream-tube" => "Mainstream Tube", "mainstream-tube" => "Mainstream Tube",
"studio-network" => "Studio & Network", "studio-network" => "Studio & Network",
"amateur-homemade" => "Amateur & Homemade", "amateur-homemade" => "Amateur & Homemade",
"creator-leaks" => "Creator & Leaks", "onlyfans" => "OnlyFans",
"asian-jav" => "Asian & JAV", "chinese" => "Chinese",
"jav" => "JAV",
"fetish-kink" => "Fetish & Kink", "fetish-kink" => "Fetish & Kink",
"hentai-animation" => "Hentai & Animation", "hentai-animation" => "Hentai & Animation",
"ai" => "AI",
"gay-male" => "Gay & Male", "gay-male" => "Gay & Male",
"live-cams" => "Live Cams", "live-cams" => "Live Cams",
"pmv-compilation" => "PMV & Compilation", "pmv-compilation" => "PMV & Compilation",
@@ -413,14 +415,15 @@ fn channel_group_order(group_id: &str) -> usize {
"meta-search" => 0, "meta-search" => 0,
"mainstream-tube" => 1, "mainstream-tube" => 1,
"studio-network" => 2, "studio-network" => 2,
"amateur-homemade" => 3, "onlyfans" => 3,
"creator-leaks" => 4, "chinese" => 4,
"asian-jav" => 5, "jav" => 5,
"fetish-kink" => 6, "fetish-kink" => 6,
"hentai-animation" => 7, "hentai-animation" => 7,
"gay-male" => 8, "ai" => 8,
"live-cams" => 9, "gay-male" => 9,
"pmv-compilation" => 10, "live-cams" => 10,
"pmv-compilation" => 11,
_ => 99, _ => 99,
} }
} }
@@ -602,7 +605,7 @@ mod tests {
#[test] #[test]
fn decorates_channel_with_group_and_tags() { fn decorates_channel_with_group_and_tags() {
let channel = decorate_channel(base_channel("hsex")); let channel = decorate_channel(base_channel("hsex"));
assert_eq!(channel.groupKey.as_deref(), Some("amateur-homemade")); assert_eq!(channel.groupKey.as_deref(), Some("chinese"));
assert_eq!(channel.sortOrder, None); assert_eq!(channel.sortOrder, None);
assert_eq!( assert_eq!(
channel.tags.as_deref(), channel.tags.as_deref(),
@@ -625,8 +628,24 @@ mod tests {
]; ];
let groups = build_channel_groups(&channels); let groups = build_channel_groups(&channels);
assert_eq!(groups[0].id, "meta-search"); assert_eq!(groups[0].id, "meta-search");
assert_eq!(groups[1].id, "amateur-homemade"); assert_eq!(groups[1].id, "chinese");
assert_eq!(groups[2].id, "asian-jav"); assert_eq!(groups[2].id, "jav");
}
#[test]
fn reflects_updated_group_moves() {
assert_eq!(
decorate_channel(base_channel("perverzija"))
.groupKey
.as_deref(),
Some("studio-network")
);
assert_eq!(
decorate_channel(base_channel("rule34gen"))
.groupKey
.as_deref(),
Some("ai")
);
} }
#[test] #[test]

View File

@@ -19,7 +19,7 @@ use wreq_util::Emulation;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "amateur-homemade", group_id: "studio-network",
tags: &["regional", "amateur", "mixed"], tags: &["regional", "amateur", "mixed"],
}; };

View File

@@ -20,7 +20,7 @@ use wreq::Version;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "creator-leaks", group_id: "onlyfans",
tags: &["creator", "onlyfans", "amateur"], tags: &["creator", "onlyfans", "amateur"],
}; };

View File

@@ -16,7 +16,7 @@ use std::collections::HashSet;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "creator-leaks", group_id: "onlyfans",
tags: &["creator", "premium", "clips"], tags: &["creator", "premium", "clips"],
}; };

View File

@@ -13,7 +13,7 @@ use std::vec;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "hentai-animation", group_id: "ai",
tags: &["rule34", "ai-generated", "animation"], tags: &["rule34", "ai-generated", "animation"],
}; };

View File

@@ -19,7 +19,7 @@ use std::{thread, vec};
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "creator-leaks", group_id: "onlyfans",
tags: &["creator", "amateur", "clips"], tags: &["creator", "amateur", "clips"],
}; };

View File

@@ -14,7 +14,7 @@ use url::form_urlencoded::Serializer;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "asian-jav", group_id: "jav",
tags: &["japanese", "amateur", "jav"], tags: &["japanese", "amateur", "jav"],
}; };

View File

@@ -14,7 +14,7 @@ use std::vec;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "creator-leaks", group_id: "onlyfans",
tags: &["database", "clips", "mixed"], tags: &["database", "clips", "mixed"],
}; };

View File

@@ -13,7 +13,7 @@ use std::vec;
pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata =
crate::providers::ProviderChannelMetadata { crate::providers::ProviderChannelMetadata {
group_id: "creator-leaks", group_id: "onlyfans",
tags: &["onlyfans", "leaks", "creator"], tags: &["onlyfans", "leaks", "creator"],
}; };