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-05-22 12:05:24 +06:00
parent 012922cd0e
commit fb9933a1de
1 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import dev.inmo.tgbotapi.types.message.textsources.mention
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.toList import kotlinx.coroutines.channels.toList
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@ -94,12 +95,12 @@ data class SlotMachineCaptchaProvider(
val userBanDateTime = eventDateTime + checkTimeSpan val userBanDateTime = eventDateTime + checkTimeSpan
val authorized = Channel<User>(newUsers.size) val authorized = Channel<User>(newUsers.size)
val messagesToDelete = Channel<Message>(Channel.UNLIMITED) val messagesToDelete = Channel<Message>(Channel.UNLIMITED)
val subContexts = newUsers.map { val subContexts = newUsers.map { user ->
createSubContextAndDoWithUpdatesFilter (stopOnCompletion = false) { createSubContextAndDoWithUpdatesFilter (stopOnCompletion = false) {
val sentMessage = sendTextMessage( val sentMessage = sendTextMessage(
chat, chat,
buildEntities { buildEntities {
+it.mention(it.firstName) +user.mention(user.firstName)
regular(", $captchaText") regular(", $captchaText")
} }
).also { messagesToDelete.send(it) } ).also { messagesToDelete.send(it) }
@ -119,9 +120,7 @@ data class SlotMachineCaptchaProvider(
launch { launch {
val clicked = arrayOf<String?>(null, null, null) val clicked = arrayOf<String?>(null, null, null)
while (leftToClick.isNotEmpty()) { while (leftToClick.isNotEmpty()) {
val userClicked = waitMessageDataCallbackQuery { val userClicked = waitMessageDataCallbackQuery().filter { it.user.id == user.id && it.message.messageId == sentDice.messageId }.first()
if (user.id == it.id && this.message.messageId == sentDice.messageId) this else null
}.first()
if (userClicked.data == leftToClick.first()) { if (userClicked.data == leftToClick.first()) {
clicked[3 - leftToClick.size] = leftToClick.removeAt(0) clicked[3 - leftToClick.size] = leftToClick.removeAt(0)
if (clicked.contains(null)) { if (clicked.contains(null)) {
@ -136,12 +135,12 @@ data class SlotMachineCaptchaProvider(
safelyWithoutExceptions { answerCallbackQuery(userClicked, "Nope") } safelyWithoutExceptions { answerCallbackQuery(userClicked, "Nope") }
} }
} }
authorized.send(it) authorized.send(user)
safelyWithoutExceptions { restrictChatMember(chat, it, permissions = leftRestrictionsPermissions) } safelyWithoutExceptions { restrictChatMember(chat, user, permissions = leftRestrictionsPermissions) }
stop() stop()
} }
this to it this to user
} }
} }
@ -204,11 +203,9 @@ data class SimpleCaptchaProvider(
} }
val job = launchSafely { val job = launchSafely {
waitMessageDataCallbackQuery ( waitMessageDataCallbackQuery().filter { query ->
filter = { query -> query.user.id == it.id && query.data == callbackData && query.message.messageId == sentMessage.messageId
query.user.id == it.id && query.data == callbackData && query.message.messageId == sentMessage.messageId }.first()
}
).first()
removeRedundantMessages() removeRedundantMessages()
safelyWithoutExceptions { restrictChatMember(chat, it, permissions = leftRestrictionsPermissions) } safelyWithoutExceptions { restrictChatMember(chat, it, permissions = leftRestrictionsPermissions) }
@ -353,23 +350,18 @@ data class ExpressionCaptchaProvider(
} }
var leftAttempts = attempts var leftAttempts = attempts
waitMessageDataCallbackQuery ( waitMessageDataCallbackQuery().takeWhile { leftAttempts > 0 }.filter { query ->
filter = { query -> val baseCheck = query.user.id == user.id && query.message.messageId == sentMessage.messageId
query.user.id == user.id && query.message.messageId == sentMessage.messageId baseCheck && if (query.data == correctAnswer) {
} true
) {
if (this.data != correctAnswer) {
leftAttempts--
if (leftAttempts < 1) {
this
} else {
answerCallbackQuery(this@waitMessageDataCallbackQuery, leftRetriesText + leftAttempts)
null
}
} else { } else {
this leftAttempts--
if (leftAttempts > 0) {
answerCallbackQuery(query, leftRetriesText + leftAttempts)
}
false
} }
}.take(1) }.firstOrNull()
banJob.cancel() banJob.cancel()