From ea801e6e0db9d85ed6a06dc033cc2d0696879e88 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Sun, 11 Dec 2022 12:17:15 +0600
Subject: [PATCH] improvements

---
 src/main/kotlin/App.kt              | 24 ++++++++++++++++++++++++
 src/main/kotlin/EnableArgsParser.kt |  8 +-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
index 9d80184..7eb4c67 100644
--- a/src/main/kotlin/App.kt
+++ b/src/main/kotlin/App.kt
@@ -21,6 +21,7 @@ import dev.inmo.tgbotapi.types.*
 import dev.inmo.tgbotapi.types.chat.ChannelChat
 import dev.inmo.tgbotapi.types.chat.PrivateChat
 import dev.inmo.tgbotapi.types.media.TelegramMediaPhoto
+import dev.inmo.tgbotapi.utils.code
 import java.io.File
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
@@ -28,7 +29,9 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.json.Json
 import models.Config
 import net.kodehawa.lib.imageboards.ImageBoard
+import net.kodehawa.lib.imageboards.boards.DefaultBoards
 import net.kodehawa.lib.imageboards.entities.BoardImage
+import kotlin.reflect.full.memberProperties
 
 /**
  * This method by default expects one argument in [args] field: telegram bot configuration
@@ -208,6 +211,26 @@ suspend fun main(args: Array<String>) {
                 delete(it)
             }
         }
+        onCommand("take_settings", requireOnlyCommandInMessage = true) {
+            val settings = runCatchingSafely {
+                repo.get(ChatId(it.chat.id.chatId))
+            }.getOrNull()
+            runCatchingSafely {
+                if (settings == null) {
+                    reply(it, "You didn't enable requesting")
+                } else {
+                    reply(it, ) {
+                        +"Query: " + code(settings.query) + "\n"
+                        +"Krontab: " + code(settings.krontabTemplate ?: "unset") + "\n"
+                        +"Board: " + code(DefaultBoards.values().first { it == settings.board.boardType }.name) + "\n"
+                        +"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())
+                    }
+                }
+            }
+        }
 
         setMyCommands(
             listOf(
@@ -216,6 +239,7 @@ suspend fun main(args: Array<String>) {
                 BotCommand("request", "Will trigger image immediately with custom settings from arguments or default settings of chat if any"),
                 BotCommand("enable", "Will enable images grabbing for current chat or update exists settings"),
                 BotCommand("disable", "Will disable bot for current chat"),
+                BotCommand("take_settings", "Take your current settings"),
             )
         )
 
diff --git a/src/main/kotlin/EnableArgsParser.kt b/src/main/kotlin/EnableArgsParser.kt
index 64ed05d..c10d75c 100644
--- a/src/main/kotlin/EnableArgsParser.kt
+++ b/src/main/kotlin/EnableArgsParser.kt
@@ -31,14 +31,8 @@ class EnableArgsParser(
         .transformValues(5) { it.joinToString(" ") }
         .help("Krontab in format * * * * *. See https://bookstack.inmo.dev/books/krontab/page/string-format")
     val board by option("-b", "--board")
+        .default("safebooru")
         .convert { ChatSettings.BoardSerializer.types.getValue(it) }
-        .run {
-            if (onlyQueryIsRequired) {
-                this
-            } else {
-                required()
-            }
-        }
         .help("Board type. Possible values: ${ChatSettings.BoardSerializer.types.keys.joinToString { it }}")
     val gallery by option("-g", "--gallery")
         .flag(default = base.gallery)