From d0ecac07aa7999b3bacb4d5cc305891a2025f597 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 30 Jun 2023 16:30:53 +0800
Subject: [PATCH] Lofi domain is deprecated

---
 app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt            | 1 -
 .../com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt  | 2 +-
 .../com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt    | 2 +-
 .../com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
index bcb7e70fe..13d8f483f 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
@@ -23,7 +23,6 @@ object EhUrl {
     const val SITE_EX = 1
     const val DOMAIN_EX = "exhentai.org"
     const val DOMAIN_E = "e-hentai.org"
-    const val DOMAIN_LOFI = "lofi.e-hentai.org"
     const val HOST_EX = "https://$DOMAIN_EX/"
     const val API_EX = HOST_EX + "api.php"
     const val FAV_PATH = "favorites.php"
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
index 4220776a0..82bcd2fad 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.kt
@@ -24,7 +24,7 @@ import java.util.regex.Pattern
  */
 object GalleryDetailUrlParser {
     private val URL_STRICT_PATTERN = Pattern.compile(
-        "https?://(?:" + EhUrl.DOMAIN_EX + "|" + EhUrl.DOMAIN_E + "|" + EhUrl.DOMAIN_LOFI + ")/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
+        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})",
     )
     private val URL_PATTERN = Pattern.compile("(\\d+)/([0-9a-f]{10})(?:[^0-9a-f]|$)")
 
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
index 8408fb18d..0fc8ad6a5 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.kt
@@ -26,7 +26,7 @@ import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
 
 object GalleryListUrlParser {
-    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E, EhUrl.DOMAIN_LOFI)
+    private val VALID_HOSTS = arrayOf(EhUrl.DOMAIN_EX, EhUrl.DOMAIN_E)
     private const val PATH_NORMAL = "/"
     private const val PATH_UPLOADER = "/uploader/"
     private const val PATH_TAG = "/tag/"
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
index 451188dd9..5e94c6acd 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageUrlParser.kt
@@ -25,7 +25,7 @@ import java.util.regex.Pattern
  */
 object GalleryPageUrlParser {
     private val URL_STRICT_PATTERN = Pattern.compile(
-        "https?://(?:" + EhUrl.DOMAIN_EX + "|" + EhUrl.DOMAIN_E + "|" + EhUrl.DOMAIN_LOFI + ")/s/([0-9a-f]{10})/(\\d+)-(\\d+)",
+        "https?://(?:${EhUrl.DOMAIN_EX}|${EhUrl.DOMAIN_E}(?:/lofi)?)/s/([0-9a-f]{10})/(\\d+)-(\\d+)",
     )
     private val URL_PATTERN = Pattern.compile("([0-9a-f]{10})/(\\d+)-(\\d+)")