Merge 3f5b8ce325 into 281f0840eb

InlineQueriesBot/build.gradle

@@ -51,6 +51,6 @@ kotlin {
 }
 
 dependencies {
-    implementation 'io.ktor:ktor-client-logging-jvm:2.3.0'
+    implementation 'io.ktor:ktor-client-logging-jvm:2.3.2'
 }
 

PollsBot/README.md

@@ -1,11 +0,0 @@
-# PollsBot
-
-This bot will send test poll in the chat where commands will be received. Commands:
-
-
-
-## Launch
-
-```bash
-../gradlew run --args="BOT_TOKEN"
-```

PollsBot/build.gradle

@@ -1,21 +0,0 @@
-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"
-}

PollsBot/src/main/kotlin/PollsBot.kt

@@ -1,99 +0,0 @@
-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.*
-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
-
-/**
- * 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) {
-    val botToken = args.first()
-
-    telegramBotWithBehaviourAndLongPolling(botToken, CoroutineScope(Dispatchers.IO)) {
-        val me = getMe()
-
-        val pollToChat = mutableMapOf<PollIdentifier, IdChatIdentifier>()
-        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, "[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()}")
-            }
-        }
-
-        allUpdatesFlow.subscribeSafelyWithoutExceptions(this) { println(it) }
-    }.second.join()
-}

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g
 
 
 kotlin_version=1.8.22
-telegram_bot_api_version=9.1.0
+telegram_bot_api_version=9.0.0
-micro_utils_version=0.19.9
+micro_utils_version=0.19.7
 serialization_version=1.5.1
-ktor_version=2.3.3
+ktor_version=2.3.2

settings.gradle

@@ -4,8 +4,6 @@ include ":RandomFileSenderBot"
 
 include ":HelloBot"
 
-include ":PollsBot"
-
 include ":GetMeBot"
 
 include ":DeepLinksBot"