v25.09.26

This commit is contained in:
Jafea7 2025-09-26 18:08:10 +10:00
parent 8f5ee9d57a
commit 001f1042f4
7 changed files with 39 additions and 25 deletions

View File

@ -11,6 +11,14 @@ If this version doesn't do what you want, don't use it ... simple.
Changes from 0xb00bface's v5.3.0 version.
25.09.26
========================
* Added BongaCams URL entry warning
* Added model online detection for CGF search, sends name instead of image URL if offline
Note: Sending name for FC2 will fail to find matches (Japanese), DC cannot send URL to preview image (wrong mimetype).
* Implement PAC (Proxy Auto Configuration)
* Fix CheckURL for SC (WinkRU)
25.09.15
========================
* Add missing UserAgent parameter to minimal-browser call for some sites

View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>25.9.15</version>
<version>25.9.26</version>
<relativePath>../master</relativePath>
</parent>

View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>25.9.15</version>
<version>25.9.26</version>
<relativePath>../master</relativePath>
</parent>

View File

@ -383,21 +383,23 @@ public class ChaturbateModel extends AbstractModel {
@Override
public boolean exists() throws IOException {
Request req = new Request.Builder() // @formatter:off
Request req = new Request.Builder()
.url(getUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.build(); // @formatter:on
.header("Accept", "*/*")
.header("Accept-Language", Locale.ENGLISH.getLanguage())
.header("User-Agent", Config.getInstance().getSettings().httpUserAgent)
.header("Referer", getUrl())
.header("Origin", getSite().getBaseUrl())
.build();
try (Response response = getSite().getHttpClient().execute(req)) {
if (!response.isSuccessful() && response.code() == 404) {
if (response.code() == 404) {
return false;
} else {
}
String body = response.body().string();
boolean banned = body.contains("This room has been banned");
boolean deleted = body.contains("This account has been deleted");
boolean redirectedToRoot = Objects.equals("/", response.request().url().encodedPath());
return !(banned || deleted || redirectedToRoot);
}
return !banned && !deleted && !redirectedToRoot;
}
}

View File

@ -426,18 +426,22 @@ public class StripchatModel extends AbstractModel {
@Override
public boolean exists() throws IOException {
try {
JSONObject jsonResponse = getModelInfo();
if (jsonResponse.optString("error").equals("Not Found")) {
log.info("Model not found: {}", getName());
return false;
}
if (jsonResponse.has("user")) {
JSONObject user = jsonResponse.getJSONObject("user");
JSONObject user = jsonResponse.getJSONObject("user").getJSONObject("user");
if (isBanned(user)) {
log.info("Model inactive or deleted: {}", getName());
return false;
}
}
} catch (HttpException e) {
if (e.getResponseCode() == 404) {
log.info("Model not found: {}", getName());
return false;
}
throw e;
}
return true;
}

View File

@ -11,7 +11,7 @@
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<packaging>pom</packaging>
<version>25.9.15</version>
<version>25.9.26</version>
<modules>
<module>../common</module>

View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>25.9.15</version>
<version>25.9.26</version>
<relativePath>../master</relativePath>
</parent>