From 8b9a58a5a0f77e58532817170a9f182147edd20e Mon Sep 17 00:00:00 2001
From: sora <sor@a.com>
Date: Thu, 20 Jul 2023 23:07:46 +0700
Subject: [PATCH] small fix

---
 Nekopoi/build.gradle.kts                       |  2 +-
 Nekopoi/src/main/kotlin/com/hexated/Nekopoi.kt | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Nekopoi/build.gradle.kts b/Nekopoi/build.gradle.kts
index 2eb99748..c3c51979 100644
--- a/Nekopoi/build.gradle.kts
+++ b/Nekopoi/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/Nekopoi/src/main/kotlin/com/hexated/Nekopoi.kt b/Nekopoi/src/main/kotlin/com/hexated/Nekopoi.kt
index 9c0a4cb7..f94d78f8 100644
--- a/Nekopoi/src/main/kotlin/com/hexated/Nekopoi.kt
+++ b/Nekopoi/src/main/kotlin/com/hexated/Nekopoi.kt
@@ -155,8 +155,8 @@ class Nekopoi : MainAPI() {
                     ) to ele.selectFirst("a:contains(ouo)")
                         ?.attr("href")
                 }.filter { it.first != Qualities.P360.value }.map {
-                    val bypassedAds = bypassMirrored(bypassOuo(it.second ?: return@map) ?: return@map)
-                    bypassedAds.apmap ads@{ adsLink ->
+                    val bypassedAds = bypassMirrored(bypassOuo(it.second))
+                    bypassedAds.amap ads@{ adsLink ->
                         loadExtractor(
                             fixEmbed(adsLink) ?: return@ads,
                             "$mainUrl/",
@@ -225,8 +225,8 @@ class Nekopoi : MainAPI() {
         return res.headers["location"]
     }
 
-    private suspend fun bypassMirrored(url: String): List<String?> {
-        val request = app.get(url)
+    private suspend fun bypassMirrored(url: String?): List<String?> {
+        val request = app.get(url ?: return emptyList())
         val hostUrl = getBaseUrl(request.url)
         var nextUrl = request.document.selectFirst("div.row div.centered a")?.attr("href")
         nextUrl = app.get(nextUrl ?: return emptyList()).text.substringAfter("\"GET\", \"")
@@ -234,11 +234,11 @@ class Nekopoi : MainAPI() {
         return app.get(fixUrl(nextUrl, hostUrl)).document.select("table.hoverable tbody tr")
             .filter { mirror ->
                 !mirrorIsBlackList(mirror.selectFirst("img")?.attr("alt"))
-            }.apmap {
+            }.amap {
                 val fileLink = it.selectFirst("a")?.attr("href")
                 app.get(
                     fixUrl(
-                        fileLink.toString(),
+                        fileLink ?: return@amap null,
                         hostUrl
                     )
                 ).document.selectFirst("div.code_wrap code")?.text()