From eea5fcc360cbf2388e88277ca367da2524939923 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 22 Sep 2022 16:06:21 +0600
Subject: [PATCH] fixes and improvements

---
 welcome/src/main/kotlin/WelcomePlugin.kt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/welcome/src/main/kotlin/WelcomePlugin.kt b/welcome/src/main/kotlin/WelcomePlugin.kt
index 091add3..b1dc48a 100644
--- a/welcome/src/main/kotlin/WelcomePlugin.kt
+++ b/welcome/src/main/kotlin/WelcomePlugin.kt
@@ -5,6 +5,7 @@ import dev.inmo.plagubot.Plugin
 import dev.inmo.plagubot.plugins.commands.full
 import dev.inmo.tgbotapi.bot.exceptions.RequestException
 import dev.inmo.tgbotapi.extensions.api.answers.answer
+import dev.inmo.tgbotapi.extensions.api.delete
 import dev.inmo.tgbotapi.extensions.api.edit.edit
 import dev.inmo.tgbotapi.extensions.api.send.reply
 import dev.inmo.tgbotapi.extensions.api.send.send
@@ -81,10 +82,13 @@ class WelcomePlugin : Plugin {
         val user = groupMessage.user
 
         if (adminsCacheAPI.isAdmin(groupMessage.chat.id, user.id)) {
+            val previousMessage = welcomeTable.get(groupMessage.chat.id)
             val sentMessage = send(
                 user,
                 replyMarkup = flatInlineKeyboard {
-                    dataButton("Unset", unsetData)
+                    if (previousMessage != null) {
+                        dataButton("Unset", unsetData)
+                    }
                     dataButton("Cancel", cancelData)
                 }
             ) {
@@ -115,9 +119,7 @@ class WelcomePlugin : Plugin {
                         it.data == cancelData && it.message.sameMessage(sentMessage)
                     }.first()
 
-                    edit(
-                        sentMessage
-                    ) {
+                    edit(sentMessage) {
                         regular("You have cancelled change of welcome message for chat ")
                         underline(groupMessage.chat.title)
                     }
@@ -148,6 +150,7 @@ class WelcomePlugin : Plugin {
                             underline(groupMessage.chat.title)
                         }
                     }
+                    delete(sentMessage)
                 },
                 parallel {
                     while (isActive) {