diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java index 9311d895..1b33180d 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java @@ -36,7 +36,7 @@ public class Flirt4FreeFavoritesUpdateService extends PaginatedScheduledService @Override public List call() throws IOException { List models = new ArrayList<>(); - String url = flirt4free.getBaseUrl() + "/my-account/secure/favorites.php?a=models&sort=online&pg=" + page; + String url = flirt4free.getBaseUrl() + "/my-account/secure/favorites.php?a=models&sort=online&status=all&pg=" + page; SiteUiFactory.getUi(flirt4free).login(); Request request = new Request.Builder() .url(url) diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java index 89d89735..4aec13d7 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java @@ -5,7 +5,6 @@ import static ctbrec.io.HttpConstants.*; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -13,13 +12,11 @@ import java.util.stream.Collectors; import org.json.JSONArray; import org.json.JSONObject; -import org.jsoup.nodes.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Config; import ctbrec.Model; -import ctbrec.io.HtmlParser; import ctbrec.io.HttpException; import ctbrec.sites.flirt4free.Flirt4Free; import ctbrec.sites.flirt4free.Flirt4FreeModel; @@ -66,15 +63,20 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService { private List parseResponse(Response response) throws IOException { List models = new ArrayList<>(); String body = response.body().string(); - Matcher m = Pattern.compile("window\\.homepageData = (\\{.*\\})", Pattern.DOTALL).matcher(body); + Matcher m = Pattern.compile("window\\.__homePageData__ = (\\{.*\\})", Pattern.DOTALL).matcher(body); if (m.find()) { JSONObject data = new JSONObject(m.group(1)); - JSONArray modelData = data.getJSONArray("liveModels"); + JSONArray modelData = data.getJSONArray("models"); LOG.debug("Found {} models", modelData.length()); for (int i = 0; i < modelData.length(); i++) { - Flirt4FreeModel model = parseModel(modelData.getString(i)); - if (model != null) { - models.add(model); + JSONObject modelJson = modelData.getJSONObject(i); + try { + Flirt4FreeModel model = parseModel(modelJson); + if (model != null) { + models.add(model); + } + } catch(Exception e) { + LOG.warn("Couldn't parse model {}", modelJson); } } return models.stream() @@ -87,43 +89,22 @@ public class Flirt4FreeUpdateService extends PaginatedScheduledService { } } - private Flirt4FreeModel parseModel(String modelHtml) { - if (modelHtml.trim().isEmpty() || !modelHtml.contains("modelLink")) { - return null; - } - Element modelDiv = HtmlParser.getTag(modelHtml, "div[class~=homepageModel]"); - String name = modelDiv.attr("data-model-seo-name"); + private Flirt4FreeModel parseModel(JSONObject modelData) { + String name = modelData.getString("model_seo_name"); Flirt4FreeModel model = (Flirt4FreeModel) flirt4Free.createModel(name); - model.setDisplayName(modelDiv.attr("data-model-name")); - Element img = HtmlParser.getTag(modelHtml, "a[class*=modelLink] img"); - img.setBaseUri(url); - if (img.hasAttr("data-live-image-src")) { - model.setPreview(img.absUrl("data-live-image-src")); - } else if (img.hasAttr("data-static-image-src")) { - model.setPreview(img.absUrl("data-static-image-src")); - } else if (img.hasAttr("data-image-url")) { - model.setPreview(img.absUrl("data-image-url")); - } else { - // background-image: url('https://cdn1.vscdns.com/images/models/samples-640x480/3241715.jpg') - Matcher m = Pattern.compile("background-image: url\\('(.*?)'\\)").matcher(img.attr("style")); - if (m.find()) { - model.setPreview(m.group(1)); - } - } - Element link = HtmlParser.getTag(modelHtml, "a.name"); - model.setDisplayName(link.attr("title")); - Element modelLink = HtmlParser.getTag(modelHtml, "a[class~=modelLink]"); - model.setUrl(Flirt4Free.BASE_URI + "/rooms/" + modelDiv.attr("data-model-seo-name") + '/'); - model.setDescription(""); - String videoHost = modelLink.attr("data-video-host"); - String modelId = modelLink.attr("data-model-id").substring(5); + model.setDisplayName(modelData.getString("display")); + model.setDescription(modelData.getString("topic")); + model.setUrl(Flirt4Free.BASE_URI + "/rooms/" + model.getName() + '/'); + model.setNew(modelData.optString("is_new", "0").equals("1")); + String videoHost = modelData.getString("video_host"); + String modelId = modelData.getString("model_id"); model.setId(modelId); String streamUrl = "https://manifest.vscdns.com/manifest.m3u8.m3u8?key=nil&provider=level3&secure=true&host=" + videoHost + "&model_id=" + modelId; model.setStreamUrl(streamUrl); + model.setPreview("https://live-screencaps.vscdns.com/"+ modelId +"-desktop.jpg"); model.setOnlineState(ctbrec.Model.State.ONLINE); model.setOnline(true); - model.setNew(!Optional.ofNullable(modelDiv.attr("data-model-new")).orElse("0").equals("0")); return model; } }