From 3b3854c488f14054c51034405212d2e3ba4d31b3 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 3 Oct 2020 13:59:19 +0200 Subject: [PATCH] Fix Streamate followed tab Also use a preview image instead of the bio pic --- .../ctbrec/ui/sites/streamate/StreamateFollowedService.java | 6 ++++-- .../ctbrec/ui/sites/streamate/StreamateUpdateService.java | 3 ++- .../java/ctbrec/sites/streamate/StreamateHttpClient.java | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java index da94fdc6..df748903 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java @@ -42,7 +42,7 @@ public class StreamateFollowedService extends PaginatedScheduledService { public StreamateFollowedService(Streamate streamate) { this.streamate = streamate; this.httpClient = (StreamateHttpClient) streamate.getHttpClient(); - this.url = "https://member.naiadsystems.com/search/v3/favorites?skipXmentSelection=true&skinConfig=%7B%7D&filters="; + this.url = "https://member.naiadsystems.com/search/v3/favorites?domain=streamate.com&filters="; } @Override @@ -66,6 +66,7 @@ public class StreamateFollowedService extends PaginatedScheduledService { .header("smtid", UUID.randomUUID().toString() + "G0211569057409") .header("smeid", UUID.randomUUID().toString() + "G0211569057409") .header("smvid", UUID.randomUUID().toString() + "G0211569057409") + .header("X-XSRF-TOKEN", httpClient.getXsrfToken()) .build(); try(Response response = streamate.getHttpClient().execute(request)) { if (response.isSuccessful()) { @@ -79,7 +80,8 @@ public class StreamateFollowedService extends PaginatedScheduledService { String nickname = p.getString("nickname"); StreamateModel model = (StreamateModel) streamate.createModel(nickname); model.setId(p.getLong("id")); - model.setPreview(p.getString("thumbnail")); + //model.setPreview(p.getString("thumbnail")); + model.setPreview("https://cdn.nsimg.net/snap/320x240/" + model.getId() + ".jpg"); boolean online = p.optBoolean("online") && notPrivateEtc(p); model.setOnline(online); model.setOnlineState(online ? ONLINE : OFFLINE); diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java index 31349c64..377f3d9e 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java @@ -60,7 +60,8 @@ public class StreamateUpdateService extends PaginatedScheduledService { String nickname = p.getString("nickname"); StreamateModel model = (StreamateModel) streamate.createModel(nickname); model.setId(p.getLong("id")); - model.setPreview(p.getString("thumbnail")); + //model.setPreview(p.getString("thumbnail")); + model.setPreview("https://cdn.nsimg.net/snap/320x240/" + model.getId() + ".jpg"); boolean online = p.optBoolean("online"); model.setOnline(online); model.setOnlineState(online ? ONLINE : OFFLINE); diff --git a/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java b/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java index 497ee5d5..dedb01cd 100644 --- a/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java +++ b/common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java @@ -99,10 +99,13 @@ public class StreamateHttpClient extends HttpClient { private synchronized boolean loginWithoutCookies() throws IOException { JSONObject loginRequest = new JSONObject(); + loginRequest.put("allowLoginRedirection", true); loginRequest.put("email", Config.getInstance().getSettings().streamateUsername); loginRequest.put("password", Config.getInstance().getSettings().streamatePassword); loginRequest.put("referrerId", 0); loginRequest.put("siteId", 1); + loginRequest.put("siteType", "premium"); + loginRequest.put("tzOffsetMinutes", 0); RequestBody body = RequestBody.create(MediaType.parse("application/json"), loginRequest.toString()); Request login = newRequestBuilder() .url(Streamate.BASE_URL + "/api/member/login")