jafea7
/
jafea7-ctbrec-v5.3.2-based
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing UA parameter to minimal-browser call

This commit is contained in:
Jafea7 2025-09-15 20:45:47 +10:00
parent 014eb0af47
commit 1929d819c2
9 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsElectronLoginDialog.java
View File

@ -35,6 +35,7 @@ public class BongaCamsElectronLoginDialog {
config.put("url", site.getBaseUrl() + "/login");
config.put("w", 640);
config.put("h", 480);
config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

5
client/src/main/java/ctbrec/ui/sites/cam4/Cam4ElectronLoginDialog.java
View File

@ -20,6 +20,7 @@ import okhttp3.HttpUrl;
public class Cam4ElectronLoginDialog {
public static final String DOMAIN = "cam4.com";
public static final String URL = Cam4.BASE_URI;
private Cam4 site;
private CookieJar cookieJar;
private ExternalBrowser browser;
@ -27,7 +28,8 @@ public class Cam4ElectronLoginDialog {
private boolean loginDialogOpened = false;
private Thread loginChecker;
public Cam4ElectronLoginDialog(CookieJar cookieJar) throws IOException {
public Cam4ElectronLoginDialog(Cam4 site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {
@ -35,6 +37,7 @@ public class Cam4ElectronLoginDialog {
config.put("url", URL);
config.put("w", 480);
config.put("h", 640);
config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java
View File

@ -44,7 +44,7 @@ public class Cam4SiteUi extends AbstractSiteUi {
} else {
// login with external browser
try {
new Cam4ElectronLoginDialog(cam4.getHttpClient().getCookieJar());
new Cam4ElectronLoginDialog(cam4, cam4.getHttpClient().getCookieJar());
} catch (Exception e1) {
log.error("Error logging in with external browser", e1);
Dialogs.showError("Login error", "Couldn't login to " + cam4.getName(), e1);

7
client/src/main/java/ctbrec/ui/sites/showup/ShowupElectronLoginDialog.java
View File

@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.util.Collections;
import java.util.function.Consumer;
import org.json.JSONObject;
import ctbrec.Config;
import ctbrec.sites.showup.Showup;
@ -19,11 +18,13 @@ import okhttp3.HttpUrl;
public class ShowupElectronLoginDialog {
public static final String DOMAIN = "showup.tv";
public static final String URL = Showup.BASE_URL;
private Showup site;
private CookieJar cookieJar;
private ExternalBrowser browser;
private boolean firstCall = true;
public ShowupElectronLoginDialog(CookieJar cookieJar) throws IOException {
public ShowupElectronLoginDialog(Showup site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {
@ -31,7 +32,7 @@ public class ShowupElectronLoginDialog {
config.put("url", URL);
config.put("w", 640);
config.put("h", 480);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java
View File

@ -44,7 +44,7 @@ public class ShowupSiteUi extends AbstractSiteUi {
} else {
// login with external browser window
try {
new ShowupElectronLoginDialog(site.getHttpClient().getCookieJar());
new ShowupElectronLoginDialog(site, site.getHttpClient().getCookieJar());
} catch (Exception e1) {
log.error("Error logging in with external browser", e1);
Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);

6
client/src/main/java/ctbrec/ui/sites/streamray/StreamrayElectronLoginDialog.java
View File

@ -18,17 +18,19 @@ import java.util.function.Consumer;
public class StreamrayElectronLoginDialog {
public static final String DOMAIN = "streamray.com";
private Streamray site;
private CookieJar cookieJar;
public StreamrayElectronLoginDialog(CookieJar cookieJar) throws IOException {
public StreamrayElectronLoginDialog(Streamray site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar;
try (ExternalBrowser browser = ExternalBrowser.getInstance()) {
var config = new JSONObject();
config.put("url", Streamray.BASE_URI);
config.put("w", 800);
config.put("h", 600);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/streamray/StreamrayFavoritesTab.java
View File

@ -31,7 +31,7 @@ public class StreamrayFavoritesTab extends ThumbOverviewTab implements FollowedT
loginButton.setPadding(new Insets(20));
loginButton.setOnAction(e -> {
try {
new StreamrayElectronLoginDialog(site.getHttpClient().getCookieJar());
new StreamrayElectronLoginDialog(site, site.getHttpClient().getCookieJar());
queue.clear();
updateService.restart();
} catch (Exception ex) {

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

@ -18,10 +18,12 @@ import java.util.function.Consumer;
public class StripchatElectronLoginDialog {
public static final String DOMAIN = Stripchat.getDomain();
public static final String URL = Stripchat.getBaseUri();
private Stripchat site;
private CookieJar cookieJar;
private ExternalBrowser browser;
public StripchatElectronLoginDialog(CookieJar cookieJar) throws IOException {
public StripchatElectronLoginDialog(Stripchat site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance();
try {
@ -29,6 +31,7 @@ public class StripchatElectronLoginDialog {
config.put("url", URL);
config.put("w", 640);
config.put("h", 640);
config.put("userAgent", site.getHttpClient().getEffectiveUserAgent());
var msg = new JSONObject();
msg.put("config", config);
browser.run(msg, msgHandler);

2
client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java
View File

@ -45,7 +45,7 @@ public class StripchatSiteUi extends AbstractSiteUi {
} else {
// login with external browser
try {
new StripchatElectronLoginDialog(site.getHttpClient().getCookieJar());
new StripchatElectronLoginDialog(site, site.getHttpClient().getCookieJar());
} catch (Exception e1) {
log.error("Error logging in with external browser", e1);
Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);