jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update StripchatModel.java

This commit is contained in:
jafea7 2025-05-05 23:08:33 +10:00
parent 5c89e9e1bc
commit 2fdc30fd46
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/ctbrec/sites/stripchat/StripchatModel.java
View File

@ -48,12 +48,10 @@ public class StripchatModel extends AbstractModel {
@Override @Override
public boolean isOnline(boolean ignoreCache) throws IOException, ExecutionException, InterruptedException { public boolean isOnline(boolean ignoreCache) throws IOException, ExecutionException, InterruptedException {
JSONObject info = getModelInfo(); if (ignoreCache) {
if (ignoreCache && info.has("user")) { JSONObject jsonResponse = getModelInfo();
JSONObject user = info.getJSONObject("user").getJSONObject("user"); if (jsonResponse.has("user")) {
if (info.has("cam")) { JSONObject user = jsonResponse.getJSONObject("user").getJSONObject("user");
JSONObject cam = info.getJSONObject("cam");
}
String status = user.optString("status"); String status = user.optString("status");
mapOnlineState(status); mapOnlineState(status);
if (onlineState == OFFLINE) { if (onlineState == OFFLINE) {
@ -61,14 +59,21 @@ public class StripchatModel extends AbstractModel {
} }
if (isBanned(user)) { if (isBanned(user)) {
log.debug("Model inactive or deleted: {}", getName()); log.debug("Model inactive or deleted: {}", getName());
// Config.getInstance().setModelNotes(this, "Model inactive or deleted"); <- from v5.0.24
setMarkedForLaterRecording(true); setMarkedForLaterRecording(true);
} }
if (onlineState == PRIVATE && StringUtil.isNotBlank((cam.optString(KEY_MODEL_TOKEN))) { if ((onlineState == PRIVATE) && jsonResponse.has("cam")) {
JSONObject cam = jsonResponse.getJSONObject("cam");
if (StringUtil.isNotBlank(cam.optString(KEY_MODEL_TOKEN))) {
setOnlineState(ONLINE); setOnlineState(ONLINE);
return true; return true;
} }
} }
}
if (jsonResponse.optString("error").equals("Not Found")) {
setMarkedForLaterRecording(true);
setOnlineState(OFFLINE);
}
}
return onlineState == ONLINE; return onlineState == ONLINE;
} }