fixes

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 
-kotlin = "1.7.22"
+kotlin = "1.8.20"
-tgbotapi = "4.2.1"
+tgbotapi = "7.0.1"
-microutils = "0.16.1"
+microutils = "0.17.6"
-imageboard = "2.5.2"
+imageboard = "2.6.0"
-krontab = "0.8.4"
+krontab = "0.10.0"
-kslog = "0.5.4"
+kslog = "1.1.1"
 exposed = "0.41.1"
-psql = "42.5.0"
+psql = "42.6.0"
-clikt = "3.5.0"
+clikt = "3.5.2"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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 /

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

src/main/kotlin/App.kt

@@ -89,13 +89,12 @@ suspend fun main(args: Array<String>) {
                     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++
                 }
-                val toDrop = (result.size - settings.count).takeIf { it > 0 } ?: return@let result
+                result.take(settings.count)
-                result.dropLast(toDrop)
             }.takeIf { it.isNotEmpty() } ?: return
             runCatchingSafely {
                 val urls = result.map { it.url }
@@ -226,7 +225,18 @@ suspend fun main(args: Array<String>) {
                         +"Count: " + code(settings.count.toString()) + "\n"
                         +"Gallery: " + code(settings.gallery.toString()) + "\n"
                         +"Rating: " + code(settings.rating ?.name ?: "unset") + "\n"
-                        +"Attach urls: " + code(settings.attachUrls.toString())
+                        +"Attach urls: " + code(settings.attachUrls.toString()) + "\n"
+                        +"Command: " + code(
+                            "/request " +
+                                "${settings.query} " +
+                                (settings.krontabTemplate ?.let { "-k $it " } ?: "") +
+                                "-b ${DefaultBoards.values().first { it == settings.board.boardType }.name.lowercase()} " +
+                                "-n ${settings.count} " +
+                                (if (settings.gallery) "-g " else "") +
+                                (settings.rating ?.let { "-r ${it.name} " } ?: "") +
+                                (if (settings.attachUrls) "-a " else "")
+
+                        )
                     }
                 }
             }

src/main/kotlin/ChatSettings.kt

@@ -41,7 +41,7 @@ data class ChatSettings(
 
     suspend fun makeRequest(page: Int): List<BoardImage> {
         return withContext(Dispatchers.IO) {
-            board.search(page, count, query, rating).blocking()
+            board.search(page, count, query, rating).blocking() ?: emptyList()
         }
     }