diff --git a/src/providers/javtiful.rs b/src/providers/javtiful.rs index f8d01bd..161d05e 100644 --- a/src/providers/javtiful.rs +++ b/src/providers/javtiful.rs @@ -151,7 +151,7 @@ impl JavtifulProvider { }; if page > 1 && !text.contains(&format!( - "{}", + "aria-current=\"page\">{}", page )) { @@ -219,7 +219,7 @@ impl JavtifulProvider { }; if page > 1 && !text.contains(&format!( - "{}", + "aria-current=\"page\">{}", page )) { @@ -361,7 +361,7 @@ impl JavtifulProvider { None => "".to_string(), }; let mut preview = seg - .split("data-trailer=\"") + .split("data-front-video-preview-src=\"") .nth(1) .and_then(|s| s.split('"').next()) .unwrap_or("") @@ -403,7 +403,8 @@ impl JavtifulProvider { .split("related-actress") .next() .and_then(|s| s.split("video-comments").next()) - .and_then(|s| s.split(">Tags<").nth(1)) + .and_then(|s| s.split(">Tags").nth(1)) + .and_then(|s| s.split("").next()) .map(|tag_block| { tag_block .split("") .next() - .and_then(|s| s.split(" ").last()) - .and_then(|s| s.replace(".", "").parse::().ok()) + .and_then(|s| s.split('>').last()) + .and_then(|s| s.trim().replace(".", "").replace(",", "").parse::().ok()) .unwrap_or(0); Ok((tags, views)) diff --git a/src/util/requester.rs b/src/util/requester.rs index c23b974..36131a7 100644 --- a/src/util/requester.rs +++ b/src/util/requester.rs @@ -164,7 +164,6 @@ impl Requester { fn looks_like_cloudflare_challenge(body: &str) -> bool { body.contains("Just a moment...") || body.contains("cf-turnstile-response") - || body.contains("challenges.cloudflare.com") || body.contains("Enable JavaScript and cookies to continue") }