davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Improve search for Stripchat

This commit is contained in:
0xb00bface 2023-12-31 17:00:57 +01:00
parent a033ffbd74
commit 0d5d1ba6cc
5 changed files with 68 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
- Added "New Girls" tab and adjusted others. All same models on less tabs - Added "New Girls" tab and adjusted others. All same models on less tabs
* Stripchat: * Stripchat:
- Added "Private" tab - Added "Private" tab
- Improved Search
- CTBRec can record your Spy/Private/Ticket shows (login required) - CTBRec can record your Spy/Private/Ticket shows (login required)
* Streamray: * Streamray:
- Added models tags - Added models tags

37
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatElectronLoginDialog.java
View File

@ -1,13 +1,5 @@
package ctbrec.ui.sites.stripchat; package ctbrec.ui.sites.stripchat;
import java.io.IOException;
import java.util.Collections;
import java.util.function.Consumer;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.sites.stripchat.Stripchat; import ctbrec.sites.stripchat.Stripchat;
import ctbrec.ui.ExternalBrowser; import ctbrec.ui.ExternalBrowser;
@ -15,12 +7,19 @@ import okhttp3.Cookie;
import okhttp3.Cookie.Builder; import okhttp3.Cookie.Builder;
import okhttp3.CookieJar; import okhttp3.CookieJar;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Collections;
import java.util.function.Consumer;
public class StripchatElectronLoginDialog { public class StripchatElectronLoginDialog {
private static final Logger LOG = LoggerFactory.getLogger(StripchatElectronLoginDialog.class); private static final Logger LOG = LoggerFactory.getLogger(StripchatElectronLoginDialog.class);
public static final String DOMAIN = Stripchat.domain; public static final String DOMAIN = Stripchat.getDomain();
public static final String URL = Stripchat.baseUri; public static final String URL = Stripchat.getBaseUri();
private CookieJar cookieJar; private CookieJar cookieJar;
private ExternalBrowser browser; private ExternalBrowser browser;
@ -44,14 +43,14 @@ public class StripchatElectronLoginDialog {
} }
private Consumer<String> msgHandler = line -> { private Consumer<String> msgHandler = line -> {
if(!line.startsWith("{")) { if (!line.startsWith("{")) {
System.err.println(line); // NOSONAR System.err.println(line); // NOSONAR
} else { } else {
var json = new JSONObject(line); var json = new JSONObject(line);
if(json.has("url")) { if (json.has("url")) {
var url = json.getString("url"); var url = json.getString("url");
if(url.endsWith(DOMAIN) || url.endsWith(DOMAIN + '/')) { if (url.endsWith(DOMAIN) || url.endsWith(DOMAIN + '/')) {
try { try {
browser.executeJavaScript("document.querySelector('button[class~=\"btn-visitors-agreement-accept\"]').click();"); browser.executeJavaScript("document.querySelector('button[class~=\"btn-visitors-agreement-accept\"]').click();");
browser.executeJavaScript("document.querySelector('div[class~=\"header-dropdown\"] a[class~=\"dropdown-link\"]').click();"); browser.executeJavaScript("document.querySelector('div[class~=\"header-dropdown\"] a[class~=\"dropdown-link\"]').click();");
@ -67,7 +66,7 @@ public class StripchatElectronLoginDialog {
} }
browser.executeJavaScript("document.querySelector('#recaptcha-checkbox-border').click();"); browser.executeJavaScript("document.querySelector('#recaptcha-checkbox-border').click();");
browser.executeJavaScript("document.querySelector('*[class~=btn-login]').addEventListener('click', function() {window.setTimeout(function() {location.reload()}, 2000)});"); browser.executeJavaScript("document.querySelector('*[class~=btn-login]').addEventListener('click', function() {window.setTimeout(function() {location.reload()}, 2000)});");
} catch(Exception e) { } catch (Exception e) {
LOG.warn("Couldn't auto fill username and password for Stripchat", e); LOG.warn("Couldn't auto fill username and password for Stripchat", e);
} }
} }
@ -85,14 +84,14 @@ public class StripchatElectronLoginDialog {
var c = createCookie(domain, cookie); var c = createCookie(domain, cookie);
cookieJar.saveFromResponse(HttpUrl.parse(url), Collections.singletonList(c)); cookieJar.saveFromResponse(HttpUrl.parse(url), Collections.singletonList(c));
c = createCookie(DOMAIN, cookie); c = createCookie(DOMAIN, cookie);
cookieJar.saveFromResponse(HttpUrl.parse(Stripchat.baseUri), Collections.singletonList(c)); cookieJar.saveFromResponse(HttpUrl.parse(Stripchat.getBaseUri()), Collections.singletonList(c));
if (c.name().contains("_com_sessionId")) { if (c.name().contains("_com_sessionId")) {
sessionCookieFound = true; sessionCookieFound = true;
} }
} }
} }
if(sessionCookieFound) { if (sessionCookieFound) {
try { try {
browser.close(); browser.close();
} catch (IOException e) { } catch (IOException e) {
@ -111,13 +110,13 @@ public class StripchatElectronLoginDialog {
.name(cookie.getString("name")) .name(cookie.getString("name"))
.value(cookie.getString("value")) .value(cookie.getString("value"))
.expiresAt(Double.valueOf(cookie.optDouble("expirationDate")).longValue()); // NOSONAR .expiresAt(Double.valueOf(cookie.optDouble("expirationDate")).longValue()); // NOSONAR
if(cookie.optBoolean("hostOnly")) { if (cookie.optBoolean("hostOnly")) {
b.hostOnlyDomain(domain); b.hostOnlyDomain(domain);
} }
if(cookie.optBoolean("httpOnly")) { if (cookie.optBoolean("httpOnly")) {
b.httpOnly(); b.httpOnly();
} }
if(cookie.optBoolean("secure")) { if (cookie.optBoolean("secure")) {
b.secure(); b.secure();
} }
return b.build(); return b.build();

47
common/src/main/java/ctbrec/sites/stripchat/Stripchat.java
View File

@ -5,6 +5,9 @@ import ctbrec.StringUtil;
import ctbrec.io.HttpClient; import ctbrec.io.HttpClient;
import ctbrec.io.HttpException; import ctbrec.io.HttpException;
import ctbrec.sites.AbstractSite; import ctbrec.sites.AbstractSite;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.json.JSONArray; import org.json.JSONArray;
@ -12,29 +15,31 @@ import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static ctbrec.io.HttpConstants.USER_AGENT; import static ctbrec.io.HttpConstants.*;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
public class Stripchat extends AbstractSite { public class Stripchat extends AbstractSite {
private static final Random RNG = new Random(); private static final Random RNG = new Random();
private static final String KEY_MODELS = "models";
public static String domain = "stripchat.com"; @Getter
public static String baseUri = "https://stripchat.com"; @Setter(AccessLevel.PROTECTED)
private static String domain = "stripchat.com";
@Getter
@Setter(AccessLevel.PROTECTED)
private static String baseUri = "https://stripchat.com";
private HttpClient httpClient; private HttpClient httpClient;
@Override @Override
public void init() throws IOException { public void init() throws IOException {
boolean hamster = getConfig().getSettings().stripchatUseXhamster; boolean hamster = getConfig().getSettings().stripchatUseXhamster;
if (hamster) { if (hamster) {
domain = "xhamsterlive.com"; Stripchat.setDomain("xhamsterlive.com");
baseUri = "https://" + domain; Stripchat.setBaseUri("https://" + domain);
} }
} }
@ -128,22 +133,30 @@ public class Stripchat extends AbstractSite {
@Override @Override
public List<Model> search(String q) throws IOException, InterruptedException { public List<Model> search(String q) throws IOException, InterruptedException {
String url = baseUri + "/api/front/v2/models/search?limit=20&query=" + URLEncoder.encode(q, UTF_8); if (StringUtil.isBlank(q)) {
return Collections.emptyList();
}
String url = baseUri + "/api/front/v4/models/search/suggestion?query=" + URLEncoder.encode(q, UTF_8) + "&limit=15&primaryTag=girls&uniq=" + getUniq();
Request req = new Request.Builder() Request req = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, baseUri)
.header(USER_AGENT, getConfig().getSettings().httpUserAgent) .header(USER_AGENT, getConfig().getSettings().httpUserAgent)
.build(); .build();
try (Response response = getHttpClient().execute(req)) { try (Response response = getHttpClient().execute(req)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject json = new JSONObject(response.body().string()); JSONObject json = new JSONObject(response.body().string());
if (json.optInt("totalCount") > 0) { if (json.has(KEY_MODELS)) {
List<Model> models = new ArrayList<>(); List<Model> models = new ArrayList<>();
JSONArray results = json.getJSONArray("models"); if (json.has(KEY_MODELS) && !json.isNull(KEY_MODELS)) {
for (int i = 0; i < results.length(); i++) { JSONArray results = json.getJSONArray(KEY_MODELS);
JSONObject result = results.getJSONObject(i); for (int i = 0; i < results.length(); i++) {
StripchatModel model = createModel(result.getString("username")); JSONObject result = results.getJSONObject(i);
model.setPreview(result.optString("previewUrlThumbBig")); StripchatModel model = createModel(result.getString("username"));
models.add(model); model.setPreview(result.optString("avatarUrl"));
models.add(model);
}
} }
return models; return models;
} else { } else {

28
common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java
View File

@ -59,7 +59,7 @@ public class StripchatHttpClient extends HttpClient {
loadCsrfToken(); loadCsrfToken();
} }
String url = Stripchat.baseUri + "/api/front/auth/login"; String url = Stripchat.getBaseUri() + "/api/front/auth/login";
JSONObject requestParams = new JSONObject(); JSONObject requestParams = new JSONObject();
requestParams.put("loginOrEmail", config.getSettings().stripchatUsername); requestParams.put("loginOrEmail", config.getSettings().stripchatUsername);
requestParams.put("password", config.getSettings().stripchatPassword); requestParams.put("password", config.getSettings().stripchatPassword);
@ -72,8 +72,8 @@ public class StripchatHttpClient extends HttpClient {
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(USER_AGENT, config.getSettings().httpUserAgent) .header(USER_AGENT, config.getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri) .header(REFERER, Stripchat.getBaseUri())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.post(body) .post(body)
.build(); .build();
@ -95,13 +95,13 @@ public class StripchatHttpClient extends HttpClient {
} }
private void loadCsrfToken() throws IOException { private void loadCsrfToken() throws IOException {
String url = Stripchat.baseUri + "/api/front/v2/config/data?requestPath=%2F&timezoneOffset=0"; String url = Stripchat.getBaseUri() + "/api/front/v2/config/data?requestPath=%2F&timezoneOffset=0";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(USER_AGENT, config.getSettings().httpUserAgent) .header(USER_AGENT, config.getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri) .header(REFERER, Stripchat.getBaseUri())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.build(); .build();
try (Response response = execute(request)) { try (Response response = execute(request)) {
@ -118,13 +118,13 @@ public class StripchatHttpClient extends HttpClient {
} }
private void loadJwtToken() throws IOException { private void loadJwtToken() throws IOException {
String url = Stripchat.baseUri + "/api/front/v2/config?requestPath=%2F&timezoneOffset=0"; String url = Stripchat.getBaseUri() + "/api/front/v2/config?requestPath=%2F&timezoneOffset=0";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(USER_AGENT, config.getSettings().httpUserAgent) .header(USER_AGENT, config.getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri) .header(REFERER, Stripchat.getBaseUri())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.build(); .build();
try (Response response = execute(request)) { try (Response response = execute(request)) {
@ -140,8 +140,6 @@ public class StripchatHttpClient extends HttpClient {
/** /**
* check, if the login worked * check, if the login worked
*
* @throws IOException
*/ */
public boolean checkLoginSuccess() throws IOException { public boolean checkLoginSuccess() throws IOException {
try { try {
@ -156,13 +154,13 @@ public class StripchatHttpClient extends HttpClient {
public long getUserId() throws JSONException, IOException { public long getUserId() throws JSONException, IOException {
if (userId == 0) { if (userId == 0) {
String url = Stripchat.baseUri + "/api/front/users/username/" + config.getSettings().stripchatUsername; String url = Stripchat.getBaseUri() + "/api/front/users/username/" + config.getSettings().stripchatUsername;
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(USER_AGENT, config.getSettings().httpUserAgent) .header(USER_AGENT, config.getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri) .header(REFERER, Stripchat.getBaseUri())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.build(); .build();
try (Response response = execute(request)) { try (Response response = execute(request)) {
@ -180,7 +178,7 @@ public class StripchatHttpClient extends HttpClient {
public JSONObject getAmpl() { public JSONObject getAmpl() {
try { try {
Cookie cookie = getCookieJar().getCookie(HttpUrl.parse(Stripchat.baseUri), "baseAmpl"); Cookie cookie = getCookieJar().getCookie(HttpUrl.parse(Stripchat.getBaseUri()), "baseAmpl");
String json = URLDecoder.decode(cookie.value(), UTF_8); String json = URLDecoder.decode(cookie.value(), UTF_8);
JSONObject ampl = new JSONObject(json); JSONObject ampl = new JSONObject(json);
return ampl; return ampl;

12
common/src/main/java/ctbrec/sites/stripchat/StripchatModel.java
View File

@ -258,7 +258,7 @@ public class StripchatModel extends AbstractModel {
JSONObject user = info.getJSONObject("user").getJSONObject("user"); JSONObject user = info.getJSONObject("user").getJSONObject("user");
long id = user.optLong("id"); long id = user.optLong("id");
String url = Stripchat.baseUri + "/api/front/users/" + client.getUserId() + "/favorites/" + id; String url = Stripchat.getBaseUri() + "/api/front/users/" + client.getUserId() + "/favorites/" + id;
JSONObject requestParams = new JSONObject() JSONObject requestParams = new JSONObject()
.put("csrfToken", client.getCsrfToken()) .put("csrfToken", client.getCsrfToken())
.put("csrfTimestamp", client.getCsrfTimestamp()) .put("csrfTimestamp", client.getCsrfTimestamp())
@ -270,8 +270,8 @@ public class StripchatModel extends AbstractModel {
.url(url) .url(url)
.header(ACCEPT, "*/*") .header(ACCEPT, "*/*")
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri + '/' + getName()) .header(REFERER, Stripchat.getBaseUri() + '/' + getName())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.put(body) .put(body)
.build(); .build();
@ -294,7 +294,7 @@ public class StripchatModel extends AbstractModel {
JSONArray favoriteIds = new JSONArray().put(id); JSONArray favoriteIds = new JSONArray().put(id);
favoriteIds.put(id); favoriteIds.put(id);
String url = Stripchat.baseUri + "/api/front/users/" + client.getUserId() + "/favorites"; String url = Stripchat.getBaseUri() + "/api/front/users/" + client.getUserId() + "/favorites";
JSONObject requestParams = new JSONObject() JSONObject requestParams = new JSONObject()
.put("favoriteIds", favoriteIds) .put("favoriteIds", favoriteIds)
.put("csrfToken", client.getCsrfToken()) .put("csrfToken", client.getCsrfToken())
@ -306,8 +306,8 @@ public class StripchatModel extends AbstractModel {
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ORIGIN, Stripchat.baseUri) .header(ORIGIN, Stripchat.getBaseUri())
.header(REFERER, Stripchat.baseUri) .header(REFERER, Stripchat.getBaseUri())
.header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON) .header(CONTENT_TYPE, MIMETYPE_APPLICATION_JSON)
.delete(body) .delete(body)
.build(); .build();