InsanusMokrassar
/
TelegramBotTutorial
mirror of https://github.com/InsanusMokrassar/TelegramBotTutorial.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor after dependencies update

This commit is contained in:
InsanusMokrassar 2022-07-11 13:07:42 +06:00
parent cf0b214ee8
commit 33b2b4fbcb
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
welcome/src/main/kotlin/WelcomePlugin.kt
View File

@ -15,6 +15,8 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitContentMe
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitMessageDataCallbackQuery
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
import dev.inmo.tgbotapi.extensions.utils.*
import dev.inmo.tgbotapi.extensions.utils.extensions.sameChat
import dev.inmo.tgbotapi.extensions.utils.extensions.sameMessage
import dev.inmo.tgbotapi.extensions.utils.formatting.*
import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
import dev.inmo.tgbotapi.types.BotCommand
@ -83,20 +85,16 @@ class WelcomePlugin : Plugin {
regular("Ok, send me the message which should be used as welcome message for chat ")
underline(groupMessage.chat.title)
},
replyMarkup = inlineKeyboard {
row {
dataButton("Unset", unsetData)
dataButton("Cancel", cancelData)
}
replyMarkup = flatInlineKeyboard {
dataButton("Unset", unsetData)
dataButton("Cancel", cancelData)
}
)
oneOf(
parallel {
val query = waitMessageDataCallbackQuery().filter {
it.data == unsetData
&& it.message.chat.id == sentMessage.chat.id
&& it.message.messageId == sentMessage.messageId
it.data == unsetData && it.message.sameMessage(sentMessage)
}.first()
val answerEntities = buildEntities {
@ -118,9 +116,7 @@ class WelcomePlugin : Plugin {
},
parallel {
val query = waitMessageDataCallbackQuery().filter {
it.data == cancelData
&& it.message.chat.id == sentMessage.chat.id
&& it.message.messageId == sentMessage.messageId
it.data == cancelData && it.message.sameMessage(sentMessage)
}.first()
edit(
@ -135,7 +131,7 @@ class WelcomePlugin : Plugin {
},
parallel {
val message = waitContentMessage().filter {
it.chat.id == sentMessage.chat.id
it.sameChat(sentMessage)
}.first()
val success = welcomeTable.set(