diff --git a/src/api.rs b/src/api.rs index 14d489e..075cf6e 100644 --- a/src/api.rs +++ b/src/api.rs @@ -124,85 +124,85 @@ async fn status(req: HttpRequest) -> Result { favicon: "https://www.google.com/s2/favicons?sz=64&domain=pornhub.com".to_string(), status: "active".to_string(), categories: vec![], - options: vec![ - ChannelOption { - id: "sort".to_string(), - title: "Sort".to_string(), - description: "Sort the Videos".to_string(), //"Sort the videos by Date or Name.".to_string(), - systemImage: "list.number".to_string(), - colorName: "blue".to_string(), - options: vec![ - FilterOption { - id: "mr".to_string(), - title: "Most Recent".to_string(), - }, - FilterOption { - id: "mv".to_string(), - title: "Most Viewed".to_string(), - }, - FilterOption { - id: "tr".to_string(), - title: "Top Rated".to_string(), - }, - FilterOption { - id: "lg".to_string(), - title: "Longest".to_string(), - }, - ], - multiSelect: false, - },], - nsfw: true, - }); - // pmvhaven - status.add_channel(Channel { - id: "pmvhaven".to_string(), - name: "Pmvhaven".to_string(), - description: "Explore a curated collection of captivating PMV".to_string(), - premium: false, - favicon: "https://www.google.com/s2/favicons?sz=64&domain=pmvhaven.com".to_string(), - status: "active".to_string(), - categories: vec![], - options: vec![ - ChannelOption { - id: "category".to_string(), - title: "Category".to_string(), - description: "Category of PMV Video get".to_string(), //"Sort the videos by Date or Name.".to_string(), - systemImage: "list.number".to_string(), - colorName: "blue".to_string(), - options: vec![ - FilterOption { - id: "all".to_string(), - title: "All".to_string(), - }, - FilterOption { - id: "pmv".to_string(), - title: "PMV".to_string(), - }, - FilterOption { - id: "hmv".to_string(), - title: "HMV".to_string(), - }, - FilterOption { - id: "tiktok".to_string(), - title: "Tiktok".to_string(), - }, - FilterOption { - id: "koreanbj".to_string(), - title: "KoreanBJ".to_string(), - }, - FilterOption { - id: "hypno".to_string(), - title: "Hypno".to_string(), - }, - FilterOption { - id: "other".to_string(), - title: "Other".to_string(), - }, - ], - multiSelect: false, - },], + options: vec![ChannelOption { + id: "sort".to_string(), + title: "Sort".to_string(), + description: "Sort the Videos".to_string(), //"Sort the videos by Date or Name.".to_string(), + systemImage: "list.number".to_string(), + colorName: "blue".to_string(), + options: vec![ + FilterOption { + id: "mr".to_string(), + title: "Most Recent".to_string(), + }, + FilterOption { + id: "mv".to_string(), + title: "Most Viewed".to_string(), + }, + FilterOption { + id: "tr".to_string(), + title: "Top Rated".to_string(), + }, + FilterOption { + id: "lg".to_string(), + title: "Longest".to_string(), + }, + ], + multiSelect: false, + }], nsfw: true, }); + if clientversion >= ClientVersion::new(22, 101, "22e".to_string()) { + // pmvhaven + status.add_channel(Channel { + id: "pmvhaven".to_string(), + name: "Pmvhaven".to_string(), + description: "Explore a curated collection of captivating PMV".to_string(), + premium: false, + favicon: "https://www.google.com/s2/favicons?sz=64&domain=pmvhaven.com".to_string(), + status: "active".to_string(), + categories: vec![], + options: vec![ChannelOption { + id: "category".to_string(), + title: "Category".to_string(), + description: "Category of PMV Video get".to_string(), //"Sort the videos by Date or Name.".to_string(), + systemImage: "list.number".to_string(), + colorName: "blue".to_string(), + options: vec![ + FilterOption { + id: "all".to_string(), + title: "All".to_string(), + }, + FilterOption { + id: "pmv".to_string(), + title: "PMV".to_string(), + }, + FilterOption { + id: "hmv".to_string(), + title: "HMV".to_string(), + }, + FilterOption { + id: "tiktok".to_string(), + title: "Tiktok".to_string(), + }, + FilterOption { + id: "koreanbj".to_string(), + title: "KoreanBJ".to_string(), + }, + FilterOption { + id: "hypno".to_string(), + title: "Hypno".to_string(), + }, + FilterOption { + id: "other".to_string(), + title: "Other".to_string(), + }, + ], + multiSelect: false, + }], + nsfw: true, + }); + } if clientversion >= ClientVersion::new(22, 97, "22a".to_string()) { // perverzija status.add_channel(Channel { @@ -428,7 +428,7 @@ async fn videos_post( page.to_string(), perPage.to_string(), featured.clone(), - category.clone() + category.clone(), ) .await; videos.items = video_items.clone(); diff --git a/src/providers/pmvhaven.rs b/src/providers/pmvhaven.rs index d683d00..7aa6a63 100644 --- a/src/providers/pmvhaven.rs +++ b/src/providers/pmvhaven.rs @@ -200,10 +200,10 @@ impl PmvhavenVideo { thumbnail, self.duration as u32, ) - .formats(vec![ - VideoFormat::new(format!("https://storage.pmvhaven.com/{}/{}_{}.mp4", video_id, encoded_title, video_id), "1080".to_string(), "mp4".to_string()).protocol("https".to_string()), - VideoFormat::new(format!("https://storage.pmvhaven.com/{}/264_{}.mp4", video_id, video_id), "1080".to_string(), "mp4".to_string()).protocol("https".to_string()) - ]) + //.formats(vec![ + // VideoFormat::new(format!("https://storage.pmvhaven.com/{}/{}_{}.mp4", video_id, encoded_title, video_id), "1080".to_string(), "mp4".to_string()).protocol("https".to_string()), + // VideoFormat::new(format!("https://storage.pmvhaven.com/{}/264_{}.mp4", video_id, video_id), "1080".to_string(), "mp4".to_string()).protocol("https".to_string()) + //]) .views(self.views); item = match self.creator{