From 3ce03835557188592609b854df533b610cca59c9 Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Sat, 3 Feb 2024 06:27:57 +0800 Subject: [PATCH] Kemono: update URL (#942) --- .../tachiyomi/multisrc/kemono/Kemono.kt | 22 +++---------------- .../multisrc/kemono/KemonoGenerator.kt | 6 ++--- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt index 34553c8c5..bc50eb012 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt @@ -32,13 +32,11 @@ import kotlin.math.min open class Kemono( override val name: String, - private val defaultUrl: String, + override val baseUrl: String, override val lang: String = "all", ) : HttpSource(), ConfigurableSource { override val supportsLatest = true - private val mirrorUrls get() = arrayOf(defaultUrl, defaultUrl.removeSuffix(".party") + ".su") - override val client = network.client.newBuilder().rateLimit(2).build() override fun headersBuilder() = super.headersBuilder() @@ -49,14 +47,9 @@ open class Kemono( private val preferences = Injekt.get().getSharedPreferences("source_$id", 0x0000) - override val baseUrl = preferences.getString(BASE_URL_PREF, defaultUrl)!! - private val apiPath = "api/v1" - private val imgCdnUrl = when (name) { - "Kemono" -> baseUrl - else -> defaultUrl - }.replace("//", "//img.") + private val imgCdnUrl = baseUrl.replace("//", "//img.") private fun String.formatAvatarUrl(): String = removePrefix("https://").replaceBefore('/', imgCdnUrl) @@ -218,15 +211,6 @@ open class Kemono( setDefaultValue(POST_PAGES_DEFAULT) }.let { screen.addPreference(it) } - ListPreference(screen.context).apply { - key = BASE_URL_PREF - title = "Mirror URL" - summary = "%s\nRequires app restart to take effect" - entries = mirrorUrls - entryValues = mirrorUrls - setDefaultValue(defaultUrl) - }.let(screen::addPreference) - SwitchPreferenceCompat(screen.context).apply { key = USE_LOW_RES_IMG title = "Use low resolution images" @@ -246,7 +230,7 @@ open class Kemono( private fun List.filterUnsupported() = filterNot { it.author == "Discord" } - private const val BASE_URL_PREF = "BASE_URL" + // private const val BASE_URL_PREF = "BASE_URL" private const val USE_LOW_RES_IMG = "USE_LOW_RES_IMG" } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt index adede6622..2aa2a06d8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/kemono/KemonoGenerator.kt @@ -9,11 +9,11 @@ class KemonoGenerator : ThemeSourceGenerator { override val themePkg = "kemono" - override val baseVersionCode = 8 + override val baseVersionCode = 9 override val sources = listOf( - SingleLang("Kemono", "https://kemono.party", "all", isNsfw = true), - SingleLang("Coomer", "https://coomer.party", "all", isNsfw = true), + SingleLang("Kemono", "https://kemono.su", "all", isNsfw = true), + SingleLang("Coomer", "https://coomer.su", "all", isNsfw = true), ) companion object {