From e663d8665ba3d2cbbb257ba47ee29c78b9322f08 Mon Sep 17 00:00:00 2001 From: jafea7 Date: Sun, 27 Apr 2025 17:42:38 +1000 Subject: [PATCH] Misc fixes --- .../ui/sites/bonga/BongaCamsElectronLoginDialog.java | 12 +++++++++--- .../chaturbate/ChaturbateElectronLoginDialog.java | 3 ++- .../streamray/AbstractStreamrayUpdateService.java | 2 +- .../stripchat/AbstractStripchatUpdateService.java | 2 +- .../ctbrec/sites/stripchat/StripchatHttpClient.java | 6 ------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java index d63ca427..3f0b8468 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java @@ -13,7 +13,9 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; +// import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Collections; import java.util.Objects; import java.util.function.Consumer; @@ -22,7 +24,7 @@ public class BongaCamsElectronLoginDialog { private static final Logger LOG = LoggerFactory.getLogger(BongaCamsElectronLoginDialog.class); public static final String DOMAIN = "bongacams.com"; - private final BongaCams site; + private BongaCams site; private CookieJar cookieJar; private ExternalBrowser browser; @@ -110,13 +112,17 @@ public class BongaCamsElectronLoginDialog { } try { - if (Objects.equals(new URL(url).getPath(), "/")) { + URI uri = new URI(url); + + if (Objects.equals(uri.getPath(), "/")) { browser.close(); } } catch (MalformedURLException e) { LOG.error("Couldn't parse new url {}", url, e); } catch (IOException e) { LOG.error("Couldn't send shutdown request to external browser", e); + } catch (URISyntaxException e) { + LOG.error("Invalid URL: " + url); } } } diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateElectronLoginDialog.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateElectronLoginDialog.java index d376edc6..2f80ad42 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateElectronLoginDialog.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateElectronLoginDialog.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.util.Collections; import java.util.Objects; @@ -22,7 +23,7 @@ public class ChaturbateElectronLoginDialog { private static final Logger LOG = LoggerFactory.getLogger(ChaturbateElectronLoginDialog.class); public static final String DOMAIN = "chaturbate.com"; - private final Chaturbate site; + private Chaturbate site; private CookieJar cookieJar; private ExternalBrowser browser; diff --git a/client/src/main/java/ctbrec/ui/sites/streamray/AbstractStreamrayUpdateService.java b/client/src/main/java/ctbrec/ui/sites/streamray/AbstractStreamrayUpdateService.java index 0ae1f535..f38a04eb 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamray/AbstractStreamrayUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/streamray/AbstractStreamrayUpdateService.java @@ -27,7 +27,7 @@ public abstract class AbstractStreamrayUpdateService extends PaginatedScheduledS protected String getPreviewURL(String name) { String lname = name.toLowerCase(); - String url = MessageFormat.format("https://s3root.prod.cams.run/cams-d-com-production-model-snapshot/won/jpg/{0}/{1}/{2}.jpg", lname.substring(0,1), lname.substring(lname.length()-1), lname); + String url = MessageFormat.format("https://images4.streamray.com/images/streamray/won/jpg/{0}/{1}/{2}_640.jpg", lname.substring(0, 1), lname.substring(lname.length() - 1), lname); try { return MessageFormat.format("https://dynimages.securedataimages.com/unsigned/rs:fill:640::0/g:no/plain/{0}@jpg", URLEncoder.encode(url, UTF_8)); } catch (Exception ex) { diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/AbstractStripchatUpdateService.java b/client/src/main/java/ctbrec/ui/sites/stripchat/AbstractStripchatUpdateService.java index fe77dc4d..69e67172 100644 --- a/client/src/main/java/ctbrec/ui/sites/stripchat/AbstractStripchatUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/stripchat/AbstractStripchatUpdateService.java @@ -19,7 +19,7 @@ public abstract class AbstractStripchatUpdateService extends PaginatedScheduledS if (timestamp == 0) { return model.optString("previewUrlThumbBig"); } - return MessageFormat.format("https://img.strpst.com/thumbs/{0}/{1}_jpg", String.valueOf(timestamp), String.valueOf(id)); + return MessageFormat.format("https://img.strpst.com/thumbs/{0}/{1}", String.valueOf(timestamp), String.valueOf(id)); } protected List createTags(JSONObject model) { diff --git a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java index 5f45d391..87625b8f 100644 --- a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java +++ b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java @@ -5,7 +5,6 @@ import ctbrec.StringUtil; import ctbrec.io.HttpClient; import ctbrec.io.HttpException; // import ctbrec.sites.stripchat.Stripchat; -import lombok.Getter; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.json.JSONException; @@ -28,15 +27,10 @@ public class StripchatHttpClient extends HttpClient { private long userId; - @Getter private String csrfToken; - @Getter private String csrfTimestamp; - @Getter private String csrfNotifyTimestamp; - @Getter private String jwtToken; - private Instant jwtTokenExp; public StripchatHttpClient(Config config) {