image fix

app/build.gradle.kts

@@ -19,7 +19,7 @@ android {
         minSdk = 21
         targetSdk = 35
         versionCode = 70
-        versionName = "5.3.20"
+        versionName = "5.3.22"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 70,
-      "versionName": "5.3.20",
+      "versionName": "5.3.22",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/xyz/quaver/pupil/hitomi/common.kt

@@ -221,7 +221,7 @@ object gg {
 suspend fun subdomainFromURL(url: String, base: String? = null, dir: String? = null): String {
     var retval = ""
 
-    if (!base.isNullOrBlank()) {
+    if (base.isNullOrBlank()) {
         when {
             dir == "webp" -> retval = "w"
             dir == "avif" -> retval = "a"
@@ -237,9 +237,9 @@ suspend fun subdomainFromURL(url: String, base: String? = null, dir: String? = n
 
     if (g != null) {
         retval = if (base.isNullOrEmpty()) {
-            (97 + gg.m(g)).toChar().toString() + base
-        } else {
             retval + (1 + gg.m(g)).toString()
+        } else {
+            (97 + gg.m(g)).toChar().toString() + base
         }
     }
 
@@ -294,7 +294,7 @@ suspend fun urlFromUrlFromHash(
         urlFromUrl(urlFromHash(galleryID, image, dir, ext), base, dir)
 
 suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean): String {
-    return urlFromUrlFromHash(galleryID, image, "webp", null, "a")
+    return urlFromUrlFromHash(galleryID, image, "webp")
 //    return when {
 //        noWebp ->
 //            urlFromUrlFromHash(galleryID, image)