InsanusMokrassar/CaptchaPlaguBotPlugin
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/CaptchaPlaguBotPlugin.git synced 2024-11-25 11:38:55 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
InsanusMokrassar 2022-07-31 00:35:05 +06:00
parent f1093d6944
commit d8dbb2512f
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/dev/inmo/plagubot/plugins/captcha/SlotMachineAnswersMarkup.kt
View File

@ -1,6 +1,7 @@
package dev.inmo.plagubot.plugins.captcha package dev.inmo.plagubot.plugins.captcha
import dev.inmo.tgbotapi.extensions.utils.SlotMachineReelImage import dev.inmo.tgbotapi.extensions.utils.SlotMachineReelImage
import dev.inmo.tgbotapi.extensions.utils.types.buttons.*
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton import dev.inmo.tgbotapi.types.buttons.InlineKeyboardButtons.CallbackDataInlineKeyboardButton
import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup import dev.inmo.tgbotapi.types.buttons.InlineKeyboardMarkup
@ -23,7 +24,10 @@ fun slotMachineReplyMarkup(
} }
else -> listOf(CallbackDataInlineKeyboardButton("$first$second$third", "$first$second$third")) else -> listOf(CallbackDataInlineKeyboardButton("$first$second$third", "$first$second$third"))
} }
return InlineKeyboardMarkup( return inlineKeyboard {
texts.chunked(2) texts.chunked(2).forEach { add(it) }
) // row {
// dataButton("Cancel (Admins only)", "cancel")
// }
}
} }

33
src/main/kotlin/dev/inmo/plagubot/plugins/captcha/provider/CaptchaProvider.kt
View File

@ -146,18 +146,20 @@ data class SlotMachineCaptchaProvider(
val clicked = arrayOf<String?>(null, null, null) val clicked = arrayOf<String?>(null, null, null)
while (leftToClick.isNotEmpty()) { while (leftToClick.isNotEmpty()) {
val userClicked = waitMessageDataCallbackQuery().filter { it.user.id == user.id && it.message.messageId == sentDice.messageId }.first() val userClicked = waitMessageDataCallbackQuery().filter { it.user.id == user.id && it.message.messageId == sentDice.messageId }.first()
if (userClicked.data == leftToClick.first()) {
clicked[3 - leftToClick.size] = leftToClick.removeAt(0) when {
if (clicked.contains(null)) { userClicked.data == leftToClick.first() -> {
safelyWithoutExceptions { answerCallbackQuery(userClicked, "Ok, next one") } clicked[3 - leftToClick.size] = leftToClick.removeAt(0)
editMessageReplyMarkup(sentDice, slotMachineReplyMarkup(clicked[0], clicked[1], clicked[2])) if (clicked.contains(null)) {
} else { safelyWithoutExceptions { answerCallbackQuery(userClicked, "Ok, next one") }
safelyWithoutExceptions { answerCallbackQuery(userClicked, "Thank you and welcome", showAlert = true) } editMessageReplyMarkup(sentDice, slotMachineReplyMarkup(clicked[0], clicked[1], clicked[2]))
safelyWithoutExceptions { deleteMessage(sentMessage) } } else {
safelyWithoutExceptions { deleteMessage(sentDice) } safelyWithoutExceptions { answerCallbackQuery(userClicked, "Thank you and welcome", showAlert = true) }
safelyWithoutExceptions { deleteMessage(sentMessage) }
safelyWithoutExceptions { deleteMessage(sentDice) }
}
} }
} else { else -> safelyWithoutExceptions { answerCallbackQuery(userClicked, "Nope") }
safelyWithoutExceptions { answerCallbackQuery(userClicked, "Nope") }
} }
} }
authorized.send(user) authorized.send(user)
@ -378,12 +380,9 @@ data class ExpressionCaptchaProvider(
if (passed == null) { if (passed == null) {
removeRedundantMessages() removeRedundantMessages()
passed = it passed = it
if (it) { when {
safelyWithoutExceptions { restrictChatMember(chat, user, permissions = leftRestrictionsPermissions) } it -> safelyWithoutExceptions { restrictChatMember(chat, user, permissions = leftRestrictionsPermissions) }
} else { kickOnUnsuccess -> banUser(chat, user, leftRestrictionsPermissions)
if (kickOnUnsuccess) {
banUser(chat, user, leftRestrictionsPermissions)
}
} }
} }
} }