From 4a90e0f427e9808aec397c6d32fc549d91d85423 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 16 Apr 2023 13:28:40 +0600 Subject: [PATCH] fixes --- sample.Dockerfile | 2 +- sample.deploy.sh | 2 +- src/main/kotlin/App.kt | 2 +- src/main/kotlin/ChatSettings.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sample.Dockerfile b/sample.Dockerfile index 2bea80f..b45f503 100644 --- a/sample.Dockerfile +++ b/sample.Dockerfile @@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11 USER 1000 -ENTRYPOINT ["/booru_grabber_bot/bin/booru_grabber_bot", "/booru_grabber_bot/local.config.json"] +ENTRYPOINT ["/booru_grabber_bot/bin/booru_grabber_bot", "/booru_grabber_bot/config.json"] ADD ./build/distributions/booru_grabber_bot.tar / diff --git a/sample.deploy.sh b/sample.deploy.sh index 54321d0..af8cf02 100644 --- a/sample.deploy.sh +++ b/sample.deploy.sh @@ -17,7 +17,7 @@ app=booru_grabber_bot version=0.0.1 server=hub.docker.com -assert_success ../gradlew build +assert_success ./gradlew build # scp ./build/distributions/AutoPostTestTelegramBot-1.0.0.zip ./config.json developer@insanusmokrassar.dev:/tmp/ assert_success sudo docker build -t $app:"$version" . assert_success sudo docker tag $app:"$version" $server/$app:$version diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt index 1eb05d0..1913a0f 100644 --- a/src/main/kotlin/App.kt +++ b/src/main/kotlin/App.kt @@ -89,7 +89,7 @@ suspend fun main(args: Array) { val images = settings.makeRequest(i).takeIf { it.isNotEmpty() } ?: break result.addAll( images.filterNot { - chatsUrlsSeen.contains(chatId, it.url) + chatsUrlsSeen.contains(chatId, it.url ?: return@filterNot true) } ) i++ diff --git a/src/main/kotlin/ChatSettings.kt b/src/main/kotlin/ChatSettings.kt index d07612b..f15b94b 100644 --- a/src/main/kotlin/ChatSettings.kt +++ b/src/main/kotlin/ChatSettings.kt @@ -41,7 +41,7 @@ data class ChatSettings( suspend fun makeRequest(page: Int): List { return withContext(Dispatchers.IO) { - board.search(page, count, query, rating).blocking() + board.search(page, count, query, rating).blocking() ?: emptyList() } }