From 9bba98179677c06d55858a4e27aa29a0c70a7046 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 21 Mar 2026 19:29:30 +0000 Subject: [PATCH] status changes --- src/providers/hsex.rs | 2 +- src/providers/javtiful.rs | 2 +- src/providers/missav.rs | 2 +- src/providers/mod.rs | 41 ++++++++++++++++++++++++++---------- src/providers/perverzija.rs | 2 +- src/providers/pimpbunny.rs | 2 +- src/providers/porn4fans.rs | 2 +- src/providers/rule34gen.rs | 2 +- src/providers/shooshtime.rs | 2 +- src/providers/tokyomotion.rs | 2 +- src/providers/xxdbx.rs | 2 +- src/providers/xxthots.rs | 2 +- 12 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/providers/hsex.rs b/src/providers/hsex.rs index 9a2b68e..50283fc 100644 --- a/src/providers/hsex.rs +++ b/src/providers/hsex.rs @@ -25,7 +25,7 @@ use wreq::Version; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "amateur-homemade", + group_id: "chinese", tags: &["amateur", "chinese", "homemade"], }; diff --git a/src/providers/javtiful.rs b/src/providers/javtiful.rs index c0dc350..cef301b 100644 --- a/src/providers/javtiful.rs +++ b/src/providers/javtiful.rs @@ -19,7 +19,7 @@ use wreq::Version; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "asian-jav", + group_id: "jav", tags: &["jav", "asian", "streaming"], }; diff --git a/src/providers/missav.rs b/src/providers/missav.rs index 847eac9..3d22f62 100644 --- a/src/providers/missav.rs +++ b/src/providers/missav.rs @@ -18,7 +18,7 @@ use wreq::Version; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "asian-jav", + group_id: "jav", tags: &["jav", "asian", "uncensored"], }; diff --git a/src/providers/mod.rs b/src/providers/mod.rs index 989d692..b36e7a8 100644 --- a/src/providers/mod.rs +++ b/src/providers/mod.rs @@ -397,10 +397,12 @@ fn channel_group_title(group_id: &str) -> &'static str { "mainstream-tube" => "Mainstream Tube", "studio-network" => "Studio & Network", "amateur-homemade" => "Amateur & Homemade", - "creator-leaks" => "Creator & Leaks", - "asian-jav" => "Asian & JAV", + "onlyfans" => "OnlyFans", + "chinese" => "Chinese", + "jav" => "JAV", "fetish-kink" => "Fetish & Kink", "hentai-animation" => "Hentai & Animation", + "ai" => "AI", "gay-male" => "Gay & Male", "live-cams" => "Live Cams", "pmv-compilation" => "PMV & Compilation", @@ -413,14 +415,15 @@ fn channel_group_order(group_id: &str) -> usize { "meta-search" => 0, "mainstream-tube" => 1, "studio-network" => 2, - "amateur-homemade" => 3, - "creator-leaks" => 4, - "asian-jav" => 5, + "onlyfans" => 3, + "chinese" => 4, + "jav" => 5, "fetish-kink" => 6, "hentai-animation" => 7, - "gay-male" => 8, - "live-cams" => 9, - "pmv-compilation" => 10, + "ai" => 8, + "gay-male" => 9, + "live-cams" => 10, + "pmv-compilation" => 11, _ => 99, } } @@ -602,7 +605,7 @@ mod tests { #[test] fn decorates_channel_with_group_and_tags() { 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.tags.as_deref(), @@ -625,8 +628,24 @@ mod tests { ]; let groups = build_channel_groups(&channels); assert_eq!(groups[0].id, "meta-search"); - assert_eq!(groups[1].id, "amateur-homemade"); - assert_eq!(groups[2].id, "asian-jav"); + assert_eq!(groups[1].id, "chinese"); + 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] diff --git a/src/providers/perverzija.rs b/src/providers/perverzija.rs index a4e017e..1743712 100644 --- a/src/providers/perverzija.rs +++ b/src/providers/perverzija.rs @@ -19,7 +19,7 @@ use wreq_util::Emulation; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "amateur-homemade", + group_id: "studio-network", tags: &["regional", "amateur", "mixed"], }; diff --git a/src/providers/pimpbunny.rs b/src/providers/pimpbunny.rs index 719aa6d..88c3703 100644 --- a/src/providers/pimpbunny.rs +++ b/src/providers/pimpbunny.rs @@ -20,7 +20,7 @@ use wreq::Version; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "creator-leaks", + group_id: "onlyfans", tags: &["creator", "onlyfans", "amateur"], }; diff --git a/src/providers/porn4fans.rs b/src/providers/porn4fans.rs index 15b6ab7..fd423d1 100644 --- a/src/providers/porn4fans.rs +++ b/src/providers/porn4fans.rs @@ -16,7 +16,7 @@ use std::collections::HashSet; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "creator-leaks", + group_id: "onlyfans", tags: &["creator", "premium", "clips"], }; diff --git a/src/providers/rule34gen.rs b/src/providers/rule34gen.rs index 04239ab..e6c3f90 100644 --- a/src/providers/rule34gen.rs +++ b/src/providers/rule34gen.rs @@ -13,7 +13,7 @@ use std::vec; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "hentai-animation", + group_id: "ai", tags: &["rule34", "ai-generated", "animation"], }; diff --git a/src/providers/shooshtime.rs b/src/providers/shooshtime.rs index 462f836..d26f03f 100644 --- a/src/providers/shooshtime.rs +++ b/src/providers/shooshtime.rs @@ -19,7 +19,7 @@ use std::{thread, vec}; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "creator-leaks", + group_id: "onlyfans", tags: &["creator", "amateur", "clips"], }; diff --git a/src/providers/tokyomotion.rs b/src/providers/tokyomotion.rs index 2f45d61..3fe485a 100644 --- a/src/providers/tokyomotion.rs +++ b/src/providers/tokyomotion.rs @@ -14,7 +14,7 @@ use url::form_urlencoded::Serializer; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "asian-jav", + group_id: "jav", tags: &["japanese", "amateur", "jav"], }; diff --git a/src/providers/xxdbx.rs b/src/providers/xxdbx.rs index 2a14c1c..8c76d64 100644 --- a/src/providers/xxdbx.rs +++ b/src/providers/xxdbx.rs @@ -14,7 +14,7 @@ use std::vec; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "creator-leaks", + group_id: "onlyfans", tags: &["database", "clips", "mixed"], }; diff --git a/src/providers/xxthots.rs b/src/providers/xxthots.rs index b519302..7cc3b6e 100644 --- a/src/providers/xxthots.rs +++ b/src/providers/xxthots.rs @@ -13,7 +13,7 @@ use std::vec; pub const CHANNEL_METADATA: crate::providers::ProviderChannelMetadata = crate::providers::ProviderChannelMetadata { - group_id: "creator-leaks", + group_id: "onlyfans", tags: &["onlyfans", "leaks", "creator"], };