From 8ac2b027ecd343935807fe226af360bc238eb539 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 15 Jul 2023 23:21:08 +0800 Subject: [PATCH] Remove deprecated hosts --- app/src/main/AndroidManifest.xml | 2 -- .../hippo/ehviewer/client/exception/OffensiveException.kt | 2 +- app/src/main/rust/src/parser/list.rs | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 66c9f09ec..34c8d8ac5 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -71,8 +71,6 @@ - - diff --git a/app/src/main/java/com/hippo/ehviewer/client/exception/OffensiveException.kt b/app/src/main/java/com/hippo/ehviewer/client/exception/OffensiveException.kt index 72bd60e62..9b31fa1d9 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/exception/OffensiveException.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/exception/OffensiveException.kt @@ -16,6 +16,6 @@ package com.hippo.ehviewer.client.exception /** - * It is an exception for get offensive tip for g.e-hentai.org + * It is an exception for get offensive tip for e-hentai.org */ class OffensiveException : EhException("OFFENSIVE") diff --git a/app/src/main/rust/src/parser/list.rs b/app/src/main/rust/src/parser/list.rs index 75b171376..79c7b57c8 100644 --- a/app/src/main/rust/src/parser/list.rs +++ b/app/src/main/rust/src/parser/list.rs @@ -81,9 +81,8 @@ fn get_thumb_key(url: &str) -> String { } fn parse_token_and_gid(str: &str) -> (i64, String) { - let reg = regex!( - "https?://(?:exhentai.org|e-hentai.org|lofi.e-hentai.org)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})" - ); + let reg = + regex!("https?://(?:exhentai.org|e-hentai.org(?:/lofi)?)/(?:g|mpv)/(\\d+)/([0-9a-f]{10})"); let grp = reg.captures(str).unwrap(); let token = &grp[2]; let gid = grp[1].parse().unwrap();