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

Fix Streamate followed tab 

Also use a preview image instead of the bio pic
This commit is contained in:
0xb00bface 2020-10-03 13:59:19 +02:00
parent 99b21845ab
commit 3b3854c488
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java
View File

@ -42,7 +42,7 @@ public class StreamateFollowedService extends PaginatedScheduledService {
public StreamateFollowedService(Streamate streamate) { public StreamateFollowedService(Streamate streamate) {
this.streamate = streamate; this.streamate = streamate;
this.httpClient = (StreamateHttpClient) streamate.getHttpClient(); 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 @Override
@ -66,6 +66,7 @@ public class StreamateFollowedService extends PaginatedScheduledService {
.header("smtid", UUID.randomUUID().toString() + "G0211569057409") .header("smtid", UUID.randomUUID().toString() + "G0211569057409")
.header("smeid", UUID.randomUUID().toString() + "G0211569057409") .header("smeid", UUID.randomUUID().toString() + "G0211569057409")
.header("smvid", UUID.randomUUID().toString() + "G0211569057409") .header("smvid", UUID.randomUUID().toString() + "G0211569057409")
.header("X-XSRF-TOKEN", httpClient.getXsrfToken())
.build(); .build();
try(Response response = streamate.getHttpClient().execute(request)) { try(Response response = streamate.getHttpClient().execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
@ -79,7 +80,8 @@ public class StreamateFollowedService extends PaginatedScheduledService {
String nickname = p.getString("nickname"); String nickname = p.getString("nickname");
StreamateModel model = (StreamateModel) streamate.createModel(nickname); StreamateModel model = (StreamateModel) streamate.createModel(nickname);
model.setId(p.getLong("id")); 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); boolean online = p.optBoolean("online") && notPrivateEtc(p);
model.setOnline(online); model.setOnline(online);
model.setOnlineState(online ? ONLINE : OFFLINE); model.setOnlineState(online ? ONLINE : OFFLINE);

3
client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java
View File

@ -60,7 +60,8 @@ public class StreamateUpdateService extends PaginatedScheduledService {
String nickname = p.getString("nickname"); String nickname = p.getString("nickname");
StreamateModel model = (StreamateModel) streamate.createModel(nickname); StreamateModel model = (StreamateModel) streamate.createModel(nickname);
model.setId(p.getLong("id")); 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"); boolean online = p.optBoolean("online");
model.setOnline(online); model.setOnline(online);
model.setOnlineState(online ? ONLINE : OFFLINE); model.setOnlineState(online ? ONLINE : OFFLINE);

3
common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java
View File

@ -99,10 +99,13 @@ public class StreamateHttpClient extends HttpClient {
private synchronized boolean loginWithoutCookies() throws IOException { private synchronized boolean loginWithoutCookies() throws IOException {
JSONObject loginRequest = new JSONObject(); JSONObject loginRequest = new JSONObject();
loginRequest.put("allowLoginRedirection", true);
loginRequest.put("email", Config.getInstance().getSettings().streamateUsername); loginRequest.put("email", Config.getInstance().getSettings().streamateUsername);
loginRequest.put("password", Config.getInstance().getSettings().streamatePassword); loginRequest.put("password", Config.getInstance().getSettings().streamatePassword);
loginRequest.put("referrerId", 0); loginRequest.put("referrerId", 0);
loginRequest.put("siteId", 1); loginRequest.put("siteId", 1);
loginRequest.put("siteType", "premium");
loginRequest.put("tzOffsetMinutes", 0);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), loginRequest.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), loginRequest.toString());
Request login = newRequestBuilder() Request login = newRequestBuilder()
.url(Streamate.BASE_URL + "/api/member/login") .url(Streamate.BASE_URL + "/api/member/login")