From 94460d1e946db1c5ee48c7f67d358bceb9e002cc Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Mon, 15 Apr 2019 16:39:09 +0200
Subject: [PATCH] Implement "add by name" and "add by url"

---
 .../ctbrec/sites/flirt4free/Flirt4Free.java    | 18 ++++++++++++------
 .../sites/flirt4free/Flirt4FreeModel.java      |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/ctbrec/sites/flirt4free/Flirt4Free.java b/common/src/main/java/ctbrec/sites/flirt4free/Flirt4Free.java
index ea12874d..f65100aa 100644
--- a/common/src/main/java/ctbrec/sites/flirt4free/Flirt4Free.java
+++ b/common/src/main/java/ctbrec/sites/flirt4free/Flirt4Free.java
@@ -171,12 +171,18 @@ public class Flirt4Free extends AbstractSite {
 
     @Override
     public Model createModelFromUrl(String url) {
-        Matcher m = Pattern.compile("https?://(?:www\\.)?camsoda.com/([^/]*?)/?").matcher(url);
-        if(m.matches()) {
-            String modelName = m.group(1);
-            return createModel(modelName);
-        } else {
-            return super.createModelFromUrl(url);
+        String[] patterns = {
+                "https?://(?:www\\.)?flirt4free.com/\\?model=(.*?)",
+                "https?://(?:www\\.)?flirt4free.com/rooms/(.*?)/?",
+                "https?://(?:www\\.)?flirt4free.com/models/bios/(.*?)/about.php"
+        };
+        for (String p : patterns) {
+            Matcher m = Pattern.compile(p).matcher(url);
+            if(m.matches()) {
+                String modelName = m.group(1);
+                return createModel(modelName);
+            }
         }
+        return super.createModelFromUrl(url);
     }
 }
diff --git a/common/src/main/java/ctbrec/sites/flirt4free/Flirt4FreeModel.java b/common/src/main/java/ctbrec/sites/flirt4free/Flirt4FreeModel.java
index 1ccedd70..0cb1cbe5 100644
--- a/common/src/main/java/ctbrec/sites/flirt4free/Flirt4FreeModel.java
+++ b/common/src/main/java/ctbrec/sites/flirt4free/Flirt4FreeModel.java
@@ -64,6 +64,7 @@ public class Flirt4FreeModel extends AbstractModel {
                 if(response.isSuccessful()) {
                     JSONObject json = new JSONObject(response.body().string());
                     online = Objects.equals(json.optString("status"), "online");
+                    id = json.getString("model_id");
                     if(online) {
                         try {
                             loadStreamUrl();