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

Use factory methods to create new HTTP requests

This commit is contained in:
0xb00bface 2022-11-26 18:49:44 +01:00
parent 97b4aa992f
commit 1accff0557
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java
View File

@ -91,7 +91,7 @@ public class BongaCamsModel extends AbstractModel {
private boolean basicOnlineCheck() { private boolean basicOnlineCheck() {
try { try {
String url = site.getBaseUrl() + "/profile/" + getName().toLowerCase(); String url = site.getBaseUrl() + "/profile/" + getName().toLowerCase();
Request req = new Request.Builder().url(url).build(); Request req = newRequestBuilder().url(url).build();
try (Response resp = site.getHttpClient().execute(req)) { try (Response resp = site.getHttpClient().execute(req)) {
if (resp.isSuccessful()) { if (resp.isSuccessful()) {
String body = Objects.requireNonNull(resp.body(), HTTP_RESPONSE_BODY_IS_NULL).string(); String body = Objects.requireNonNull(resp.body(), HTTP_RESPONSE_BODY_IS_NULL).string();
@ -146,12 +146,9 @@ public class BongaCamsModel extends AbstractModel {
.add(ARGS, getName()) .add(ARGS, getName())
.add(ARGS, "false") .add(ARGS, "false")
.build(); .build();
Request request = new Request.Builder() Request request = newRequestBuilder()
.url(url) .url(url)
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON) .addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, getSite().getBaseUrl())
.addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST) .addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.post(body) .post(body)
.build(); .build();
@ -192,7 +189,7 @@ public class BongaCamsModel extends AbstractModel {
@Override @Override
public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException { public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException {
String streamUrl = getStreamUrl(); String streamUrl = getStreamUrl();
Request req = new Request.Builder().url(streamUrl).build(); Request req = newRequestBuilder().url(streamUrl).build();
try (Response response = site.getHttpClient().execute(req)) { try (Response response = site.getHttpClient().execute(req)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
InputStream inputStream = Objects.requireNonNull(response.body(), HTTP_RESPONSE_BODY_IS_NULL).byteStream(); InputStream inputStream = Objects.requireNonNull(response.body(), HTTP_RESPONSE_BODY_IS_NULL).byteStream();
@ -253,11 +250,9 @@ public class BongaCamsModel extends AbstractModel {
.add(ARGS, Integer.toString(userId)) .add(ARGS, Integer.toString(userId))
.add("args[3]", "") .add("args[3]", "")
.build(); .build();
Request request = new Request.Builder() Request request = newRequestBuilder()
.url(url) .url(url)
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON) .addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, getSite().getBaseUrl() + '/' + getName()) .addHeader(REFERER, getSite().getBaseUrl() + '/' + getName())
.addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST) .addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.post(body) .post(body)
@ -313,13 +308,10 @@ public class BongaCamsModel extends AbstractModel {
.add("src", "public-chat") .add("src", "public-chat")
.add("_csrf_token", getCsrfToken()) .add("_csrf_token", getCsrfToken())
.build(); .build();
Request req = new Request.Builder() Request req = newRequestBuilder()
.url(url) .url(url)
.method("POST", body) .method("POST", body)
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, getUrl()) .header(REFERER, getUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(X_REQUESTED_WITH, XML_HTTP_REQUEST) .header(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.build(); .build();
try (Response resp = site.getHttpClient().execute(req)) { try (Response resp = site.getHttpClient().execute(req)) {
@ -340,13 +332,7 @@ public class BongaCamsModel extends AbstractModel {
} }
private String getCsrfToken() throws IOException { private String getCsrfToken() throws IOException {
Request req = new Request.Builder() Request req = newRequestBuilder().url(getUrl()).build();
.url(getUrl())
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, getSite().getBaseUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.build();
try (Response resp = site.getHttpClient().execute(req)) { try (Response resp = site.getHttpClient().execute(req)) {
if (resp.isSuccessful()) { if (resp.isSuccessful()) {
String content = Objects.requireNonNull(resp.body(), HTTP_RESPONSE_BODY_IS_NULL).string(); String content = Objects.requireNonNull(resp.body(), HTTP_RESPONSE_BODY_IS_NULL).string();
@ -371,13 +357,10 @@ public class BongaCamsModel extends AbstractModel {
RequestBody body = new FormBody.Builder() RequestBody body = new FormBody.Builder()
.add("_csrf_token", getCsrfToken()) .add("_csrf_token", getCsrfToken())
.build(); .build();
Request req = new Request.Builder() Request req = newRequestBuilder()
.url(url) .url(url)
.method("POST", body) .method("POST", body)
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, getUrl()) .header(REFERER, getUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(X_REQUESTED_WITH, XML_HTTP_REQUEST) .header(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.build(); .build();
try (Response resp = site.getHttpClient().execute(req)) { try (Response resp = site.getHttpClient().execute(req)) {
@ -413,11 +396,7 @@ public class BongaCamsModel extends AbstractModel {
@Override @Override
public boolean exists() throws IOException { public boolean exists() throws IOException {
Request req = new Request.Builder() // @formatter:off Request req = newRequestBuilder().url(getUrl()).build();
.url(getUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.build(); // @formatter:on
try (Response response = getSite().getHttpClient().execute(req)) { try (Response response = getSite().getHttpClient().execute(req)) {
if (!response.isSuccessful() && response.code() == 404) { if (!response.isSuccessful() && response.code() == 404) {
return false; return false;
@ -426,4 +405,13 @@ public class BongaCamsModel extends AbstractModel {
} }
} }
} }
private Request.Builder newRequestBuilder() {
return new Request.Builder()
.url(getUrl())
.header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, getSite().getBaseUrl())
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent);
}
} }