From 2ce47074d8030842532f26a4dbb823acf33e2d46 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Aug 2023 18:32:43 +0600 Subject: [PATCH 1/4] update dependencies --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 991cea5..1ce8df4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g kotlin_version=1.8.22 -telegram_bot_api_version=9.0.0 -micro_utils_version=0.19.7 +telegram_bot_api_version=9.1.0 +micro_utils_version=0.19.9 serialization_version=1.5.1 -ktor_version=2.3.2 +ktor_version=2.3.3 From d289c2101d68080652d16437a2057d98a20425db Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 20 Aug 2023 02:30:18 +0600 Subject: [PATCH 2/4] add polls sample bot --- PollsBot/README.md | 11 ++++ PollsBot/build.gradle | 21 +++++++ PollsBot/src/main/kotlin/PollsBot.kt | 89 ++++++++++++++++++++++++++++ settings.gradle | 2 + 4 files changed, 123 insertions(+) create mode 100644 PollsBot/README.md create mode 100644 PollsBot/build.gradle create mode 100644 PollsBot/src/main/kotlin/PollsBot.kt diff --git a/PollsBot/README.md b/PollsBot/README.md new file mode 100644 index 0000000..d810d47 --- /dev/null +++ b/PollsBot/README.md @@ -0,0 +1,11 @@ +# PollsBot + +This bot will send test poll in the chat where commands will be received. Commands: + + + +## Launch + +```bash +../gradlew run --args="BOT_TOKEN" +``` diff --git a/PollsBot/build.gradle b/PollsBot/build.gradle new file mode 100644 index 0000000..0188724 --- /dev/null +++ b/PollsBot/build.gradle @@ -0,0 +1,21 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +apply plugin: 'kotlin' +apply plugin: 'application' + +mainClassName="HelloBotKt" + + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + implementation "dev.inmo:tgbotapi:$telegram_bot_api_version" +} diff --git a/PollsBot/src/main/kotlin/PollsBot.kt b/PollsBot/src/main/kotlin/PollsBot.kt new file mode 100644 index 0000000..0f20259 --- /dev/null +++ b/PollsBot/src/main/kotlin/PollsBot.kt @@ -0,0 +1,89 @@ +import com.benasher44.uuid.uuid4 +import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions +import dev.inmo.tgbotapi.extensions.api.bot.getMe +import dev.inmo.tgbotapi.extensions.api.chat.get.getChat +import dev.inmo.tgbotapi.extensions.api.send.* +import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll +import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMentionWithAnyContent +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollAnswer +import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat +import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.ifChannelChat +import dev.inmo.tgbotapi.extensions.utils.ifFromChannelGroupContentMessage +import dev.inmo.tgbotapi.types.ChatId +import dev.inmo.tgbotapi.types.IdChatIdentifier +import dev.inmo.tgbotapi.types.PollIdentifier +import dev.inmo.tgbotapi.types.chat.* +import dev.inmo.tgbotapi.types.chat.GroupChat +import dev.inmo.tgbotapi.types.chat.PrivateChat +import dev.inmo.tgbotapi.types.chat.SupergroupChat +import dev.inmo.tgbotapi.types.message.MarkdownV2 +import dev.inmo.tgbotapi.types.polls.Poll +import dev.inmo.tgbotapi.types.polls.PollAnswer +import dev.inmo.tgbotapi.types.polls.PollOption +import dev.inmo.tgbotapi.types.polls.RegularPoll +import dev.inmo.tgbotapi.utils.PreviewFeature +import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common +import kotlinx.coroutines.* +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock + +/** + * The main purpose of this bot is just to answer "Oh, hi, " and add user mention here + */ +@OptIn(PreviewFeature::class) +suspend fun main(vararg args: String) { + val botToken = args.first() + + telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) { + val me = getMe() + + val pollToChat = mutableMapOf() + val pollToChatMutex = Mutex() + + onCommand("anonymous") { + val sentPoll = sendRegularPoll( + it.chat, + "Test regular anonymous poll", + (1 .. 10).map { + it.toString() + }, + isAnonymous = true, + replyToMessageId = it.messageId + ) + pollToChatMutex.withLock { + pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id + } + } + + onCommand("public") { + val sentPoll = sendRegularPoll( + it.chat, + "Test regular anonymous poll", + (1 .. 10).map { + it.toString() + }, + isAnonymous = false, + replyToMessageId = it.messageId + ) + pollToChatMutex.withLock { + pollToChat[sentPoll.content.poll.id] = sentPoll.chat.id + } + } + + onPollAnswer { + val chatId = pollToChat[it.pollId] ?: return@onPollAnswer + + when(it) { + is PollAnswer.Public -> send(chatId, "User ${it.user} have answered") + is PollAnswer.Anonymous -> send(chatId, "Chat ${it.voterChat} have answered") + } + } + + allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) } + }.second.join() +} diff --git a/settings.gradle b/settings.gradle index a76f386..ea37daa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,8 @@ include ":RandomFileSenderBot" include ":HelloBot" +include ":PollsBot" + include ":GetMeBot" include ":DeepLinksBot" From e28a79579641711541608f5d0ff2b936d1c73632 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 20 Aug 2023 11:38:56 +0600 Subject: [PATCH 3/4] Update PollsBot.kt --- PollsBot/src/main/kotlin/PollsBot.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PollsBot/src/main/kotlin/PollsBot.kt b/PollsBot/src/main/kotlin/PollsBot.kt index 0f20259..efde7cf 100644 --- a/PollsBot/src/main/kotlin/PollsBot.kt +++ b/PollsBot/src/main/kotlin/PollsBot.kt @@ -33,7 +33,11 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock /** - * The main purpose of this bot is just to answer "Oh, hi, " and add user mention here + * This bot will answer with anonymous or public poll and send message on + * updates of any of it. + * + * * Use `/anonymous` to take anonymous regular poll + * * Use `/public` to take public regular poll */ @OptIn(PreviewFeature::class) suspend fun main(vararg args: String) { From fff8edde5f3ad20420d49a35fc738ce0cccb5f32 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 20 Aug 2023 14:30:55 +0600 Subject: [PATCH 4/4] update PollsBot --- PollsBot/src/main/kotlin/PollsBot.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/PollsBot/src/main/kotlin/PollsBot.kt b/PollsBot/src/main/kotlin/PollsBot.kt index efde7cf..f489fc4 100644 --- a/PollsBot/src/main/kotlin/PollsBot.kt +++ b/PollsBot/src/main/kotlin/PollsBot.kt @@ -5,10 +5,7 @@ import dev.inmo.tgbotapi.extensions.api.chat.get.getChat import dev.inmo.tgbotapi.extensions.api.send.* import dev.inmo.tgbotapi.extensions.api.send.polls.sendRegularPoll import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onMentionWithAnyContent -import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onPollAnswer +import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.* import dev.inmo.tgbotapi.extensions.utils.extensions.raw.sender_chat import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2 import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2 @@ -83,8 +80,17 @@ suspend fun main(vararg args: String) { val chatId = pollToChat[it.pollId] ?: return@onPollAnswer when(it) { - is PollAnswer.Public -> send(chatId, "User ${it.user} have answered") - is PollAnswer.Anonymous -> send(chatId, "Chat ${it.voterChat} have answered") + is PollAnswer.Public -> send(chatId, "[onPollAnswer] User ${it.user} have answered") + is PollAnswer.Anonymous -> send(chatId, "[onPollAnswer] Chat ${it.voterChat} have answered") + } + } + + onPollUpdates { + val chatId = pollToChat[it.id] ?: return@onPollUpdates + + when(it.isAnonymous) { + false -> send(chatId, "[onPollUpdates] Public poll updated: ${it.options.joinToString()}") + true -> send(chatId, "[onPollUpdates] Anonymous poll updated: ${it.options.joinToString()}") } }