j62
/
ctbrec
2
2
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases 3 Wiki Activity

Don't try to load followed models, if username is not set

This commit is contained in:
0xboobface 2018-10-24 19:07:45 +02:00
parent 306f07cf63
commit f0d2a720ab
2 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/ctbrec/sites/chaturbate/ChaturbateUpdateService.java
View File

@ -1,11 +1,13 @@
package ctbrec.sites.chaturbate; package ctbrec.sites.chaturbate;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import org.eclipse.jetty.util.StringUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -44,18 +46,22 @@ public class ChaturbateUpdateService extends PaginatedScheduledService {
return new Task<List<Model>>() { return new Task<List<Model>>() {
@Override @Override
public List<Model> call() throws IOException { public List<Model> call() throws IOException {
String url = ChaturbateUpdateService.this.url + "?page="+page+"&keywords=&_=" + System.currentTimeMillis(); if(loginRequired && StringUtil.isBlank(ctbrec.Config.getInstance().getSettings().username)) {
LOG.debug("Fetching page {}", url); return Collections.emptyList();
Request request = new Request.Builder().url(url).build();
Response response = chaturbate.getHttpClient().execute(request, loginRequired);
if (response.isSuccessful()) {
List<Model> models = ChaturbateModelParser.parseModels(chaturbate, response.body().string());
response.close();
return models;
} else { } else {
int code = response.code(); String url = ChaturbateUpdateService.this.url + "?page="+page+"&keywords=&_=" + System.currentTimeMillis();
response.close(); LOG.debug("Fetching page {}", url);
throw new IOException("HTTP status " + code); Request request = new Request.Builder().url(url).build();
Response response = chaturbate.getHttpClient().execute(request, loginRequired);
if (response.isSuccessful()) {
List<Model> models = ChaturbateModelParser.parseModels(chaturbate, response.body().string());
response.close();
return models;
} else {
int code = response.code();
response.close();
throw new IOException("HTTP status " + code);
}
} }
} }
}; };

103
src/main/java/ctbrec/sites/mfc/FriendsUpdateService.java
View File

@ -3,9 +3,11 @@ package ctbrec.sites.mfc;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.eclipse.jetty.util.StringUtil;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -36,57 +38,60 @@ public class FriendsUpdateService extends PaginatedScheduledService {
return new Task<List<Model>>() { return new Task<List<Model>>() {
@Override @Override
public List<Model> call() throws IOException { public List<Model> call() throws IOException {
List<MyFreeCamsModel> models = new ArrayList<>(); if(StringUtil.isBlank(ctbrec.Config.getInstance().getSettings().username)) {
String url = myFreeCams.getBaseUrl() + "/php/manage_lists2.php?passcode=&list_type=friends&data_mode=online&get_user_list=1"; return Collections.emptyList();
Request req = new Request.Builder()
.url(url)
.header("Referer", myFreeCams.getBaseUrl())
.build();
Response resp = myFreeCams.getHttpClient().execute(req, true);
if(resp.isSuccessful()) {
String json = resp.body().string().substring(4);
try {
JSONObject object = new JSONObject(json);
for (String key : object.keySet()) {
int uid = Integer.parseInt(key);
MyFreeCamsModel model = MyFreeCamsClient.getInstance().getModel(uid);
if(model == null) {
JSONObject modelObject = object.getJSONObject(key);
String name = modelObject.getString("u");
model = myFreeCams.createModel(name);
SessionState st = new SessionState();
st.setM(new ctbrec.sites.mfc.Model());
st.getM().setCamscore(0.0);
st.setU(new User());
st.setUid(uid);
st.setLv(modelObject.getInt("lv"));
st.setVs(127);
model.update(st, myFreeCams.getClient().getStreamUrl(st));
}
models.add(model);
}
} catch(Exception e) {
LOG.info("JSON: {}", json);
throw e;
}
} else { } else {
LOG.error("Couldn't load friends list {} {}", resp.code(), resp.message()); List<MyFreeCamsModel> models = new ArrayList<>();
resp.close(); String url = myFreeCams.getBaseUrl() + "/php/manage_lists2.php?passcode=&list_type=friends&data_mode=online&get_user_list=1";
} Request req = new Request.Builder()
boolean filterOnline = mode == Mode.ONLINE; .url(url)
return models.stream() .header("Referer", myFreeCams.getBaseUrl())
.filter(m -> { .build();
try { Response resp = myFreeCams.getHttpClient().execute(req, true);
return m.isOnline() == filterOnline; if(resp.isSuccessful()) {
} catch(Exception e) { String body = resp.body().string().substring(4);
return false; try {
JSONObject json = new JSONObject(body);
for (String key : json.keySet()) {
int uid = Integer.parseInt(key);
MyFreeCamsModel model = MyFreeCamsClient.getInstance().getModel(uid);
if(model == null) {
JSONObject modelObject = json.getJSONObject(key);
String name = modelObject.getString("u");
model = myFreeCams.createModel(name);
SessionState st = new SessionState();
st.setM(new ctbrec.sites.mfc.Model());
st.getM().setCamscore(0.0);
st.setU(new User());
st.setUid(uid);
st.setLv(modelObject.getInt("lv"));
st.setVs(127);
model.update(st, myFreeCams.getClient().getStreamUrl(st));
}
models.add(model);
} }
}) } catch(Exception e) {
.sorted((m1,m2) -> (int)(m2.getCamScore() - m1.getCamScore())) LOG.info("Exception getting friends list. Response was: {}", body);
.skip((page-1) * 50) }
.limit(50) } else {
.collect(Collectors.toList()); LOG.error("Couldn't load friends list {} {}", resp.code(), resp.message());
resp.close();
}
boolean filterOnline = mode == Mode.ONLINE;
return models.stream()
.filter(m -> {
try {
return m.isOnline() == filterOnline;
} catch(Exception e) {
return false;
}
})
.sorted((m1,m2) -> (int)(m2.getCamScore() - m1.getCamScore()))
.skip((page-1) * 50)
.limit(50)
.collect(Collectors.toList());
}
} }
}; };
} }