jafea7
/
jafea7-ctbrec-v5.3.0-based
mirror of https://github.com/Jafea7/0xb00bface-ctbrec.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:46:23 +10:00
parent 5731d80f7f
commit b206d4e2fe
9 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@ import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
// import java.net.URL;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Collections; import java.util.Collections;
import java.util.Objects; import java.util.Objects;
@ -35,6 +34,7 @@ public class BongaCamsElectronLoginDialog {
config.put("url", site.getBaseUrl() + "/login"); config.put("url", site.getBaseUrl() + "/login");
config.put("w", 640); config.put("w", 640);
config.put("h", 480); config.put("h", 480);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject(); var msg = new JSONObject();
msg.put("config", config); msg.put("config", config);
browser.run(msg, msgHandler); browser.run(msg, msgHandler);

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

@ -21,6 +21,7 @@ public class Cam4ElectronLoginDialog {
public static final String DOMAIN = "cam4.com"; public static final String DOMAIN = "cam4.com";
public static final String URL = Cam4.BASE_URI; public static final String URL = Cam4.BASE_URI;
private Cam4 site;
private CookieJar cookieJar; private CookieJar cookieJar;
private ExternalBrowser browser; private ExternalBrowser browser;
@ -28,7 +29,8 @@ public class Cam4ElectronLoginDialog {
private boolean loginDialogOpened = false; private boolean loginDialogOpened = false;
private Thread loginChecker; private Thread loginChecker;
public Cam4ElectronLoginDialog(CookieJar cookieJar) throws IOException { public Cam4ElectronLoginDialog(Cam4 site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar; this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance(); browser = ExternalBrowser.getInstance();
try { try {
@ -36,6 +38,7 @@ public class Cam4ElectronLoginDialog {
config.put("url", URL); config.put("url", URL);
config.put("w", 480); config.put("w", 480);
config.put("h", 640); config.put("h", 640);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject(); var msg = new JSONObject();
msg.put("config", config); msg.put("config", config);
browser.run(msg, msgHandler); 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 { } else {
// login with external browser // login with external browser
try { try {
new Cam4ElectronLoginDialog(cam4.getHttpClient().getCookieJar()); new Cam4ElectronLoginDialog(cam4, cam4.getHttpClient().getCookieJar());
} catch (Exception e1) { } catch (Exception e1) {
log.error("Error logging in with external browser", e1); log.error("Error logging in with external browser", e1);
Dialogs.showError("Login error", "Couldn't login to " + cam4.getName(), e1); Dialogs.showError("Login error", "Couldn't login to " + cam4.getName(), e1);

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

@ -20,11 +20,13 @@ public class ShowupElectronLoginDialog {
public static final String DOMAIN = "showup.tv"; public static final String DOMAIN = "showup.tv";
public static final String URL = Showup.BASE_URL; public static final String URL = Showup.BASE_URL;
private Showup site;
private CookieJar cookieJar; private CookieJar cookieJar;
private ExternalBrowser browser; private ExternalBrowser browser;
private boolean firstCall = true; private boolean firstCall = true;
public ShowupElectronLoginDialog(CookieJar cookieJar) throws IOException { public ShowupElectronLoginDialog(Showup site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar; this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance(); browser = ExternalBrowser.getInstance();
try { try {

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

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

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

@ -18,10 +18,12 @@ import java.util.function.Consumer;
public class StreamrayElectronLoginDialog { public class StreamrayElectronLoginDialog {
public static final String DOMAIN = "streamray.com"; public static final String DOMAIN = "streamray.com";
private Streamray site;
private CookieJar cookieJar; private CookieJar cookieJar;
public StreamrayElectronLoginDialog(CookieJar cookieJar) throws IOException { public StreamrayElectronLoginDialog(Streamray site, CookieJar cookieJar) throws IOException {
this.site = site;
this.cookieJar = cookieJar; this.cookieJar = cookieJar;
try (ExternalBrowser browser = ExternalBrowser.getInstance()) { try (ExternalBrowser browser = ExternalBrowser.getInstance()) {
var config = new JSONObject(); var config = new JSONObject();

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.setPadding(new Insets(20));
loginButton.setOnAction(e -> { loginButton.setOnAction(e -> {
try { try {
new StreamrayElectronLoginDialog(site.getHttpClient().getCookieJar()); new StreamrayElectronLoginDialog(site, site.getHttpClient().getCookieJar());
queue.clear(); queue.clear();
updateService.restart(); updateService.restart();
} catch (Exception ex) { } catch (Exception ex) {

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

@ -21,7 +21,7 @@ public class StripchatElectronLoginDialog {
private CookieJar cookieJar; private CookieJar cookieJar;
private ExternalBrowser browser; private ExternalBrowser browser;
public StripchatElectronLoginDialog(CookieJar cookieJar) throws IOException { public StripchatElectronLoginDialog(Stripchat site, CookieJar cookieJar) throws IOException {
this.cookieJar = cookieJar; this.cookieJar = cookieJar;
browser = ExternalBrowser.getInstance(); browser = ExternalBrowser.getInstance();
try { try {
@ -29,6 +29,7 @@ public class StripchatElectronLoginDialog {
config.put("url", URL); config.put("url", URL);
config.put("w", 640); config.put("w", 640);
config.put("h", 640); config.put("h", 640);
config.put("userAgent", Config.getInstance().getSettings().httpUserAgent);
var msg = new JSONObject(); var msg = new JSONObject();
msg.put("config", config); msg.put("config", config);
browser.run(msg, msgHandler); 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 { } else {
// login with external browser // login with external browser
try { try {
new StripchatElectronLoginDialog(site.getHttpClient().getCookieJar()); new StripchatElectronLoginDialog(site, site.getHttpClient().getCookieJar());
} catch (Exception e1) { } catch (Exception e1) {
log.error("Error logging in with external browser", e1); log.error("Error logging in with external browser", e1);
Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1); Dialogs.showError("Login error", "Couldn't login to " + site.getName(), e1);