From 1eb9676c1998834e8f627f2136a355520d79989d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 4 Oct 2020 17:32:50 +0600 Subject: [PATCH] migration onto 0.29.0 --- FilesLoaderBot/build.gradle | 2 +- .../src/main/kotlin/FilesLoaderBot.kt | 18 ++++++------ ForwarderBot/build.gradle | 2 +- ForwarderBot/src/main/kotlin/ForwarderBot.kt | 20 ++++++------- GetMeBot/build.gradle | 2 +- GetMeBot/src/main/kotlin/GetMeBot.kt | 4 +-- HelloBot/build.gradle | 2 +- HelloBot/src/main/kotlin/HelloBot.kt | 28 +++++++++++-------- RandomFileSenderBot/build.gradle | 2 +- .../src/main/kotlin/RandomFileSenderBot.kt | 20 ++++++------- ResenderBot/ResenderBotLib/build.gradle | 2 +- .../src/commonMain/kotlin/ResenderBot.kt | 16 +++++------ gradle.properties | 2 +- 13 files changed, 63 insertions(+), 57 deletions(-) diff --git a/FilesLoaderBot/build.gradle b/FilesLoaderBot/build.gradle index ab6837b..d89f3e5 100644 --- a/FilesLoaderBot/build.gradle +++ b/FilesLoaderBot/build.gradle @@ -20,5 +20,5 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + implementation "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } diff --git a/FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt b/FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt index 6ca6e48..a831bbf 100644 --- a/FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt +++ b/FilesLoaderBot/src/main/kotlin/FilesLoaderBot.kt @@ -1,12 +1,12 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.downloadFile -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.get.getFileAdditionalInfo -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.flatMap -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.safely -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts.* -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaContent -import com.github.insanusmokrassar.TelegramBotAPI.utils.filenameFromUrl +import dev.inmo.tgbotapi.extensions.api.downloadFile +import dev.inmo.tgbotapi.extensions.api.get.getFileAdditionalInfo +import dev.inmo.tgbotapi.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.utils.flatMap +import dev.inmo.tgbotapi.extensions.utils.safely +import dev.inmo.tgbotapi.extensions.utils.shortcuts.* +import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaContent +import dev.inmo.tgbotapi.utils.filenameFromUrl import kotlinx.coroutines.* import kotlinx.coroutines.flow.* import java.io.File diff --git a/ForwarderBot/build.gradle b/ForwarderBot/build.gradle index c68f401..1c88bf0 100644 --- a/ForwarderBot/build.gradle +++ b/ForwarderBot/build.gradle @@ -20,5 +20,5 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + implementation "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } diff --git a/ForwarderBot/src/main/kotlin/ForwarderBot.kt b/ForwarderBot/src/main/kotlin/ForwarderBot.kt index 064a6e2..d30f051 100644 --- a/ForwarderBot/src/main/kotlin/ForwarderBot.kt +++ b/ForwarderBot/src/main/kotlin/ForwarderBot.kt @@ -1,13 +1,13 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.sendTextMessage -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.formatting.codeMarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.formatting.regularMarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.safely -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.asContentMessagesFlow -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.message.* -import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.PossiblyForwardedMessage +import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage +import dev.inmo.tgbotapi.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.utils.formatting.codeMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.formatting.regularMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.safely +import dev.inmo.tgbotapi.extensions.utils.updates.asContentMessagesFlow +import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.message.* +import dev.inmo.tgbotapi.types.message.abstracts.PossiblyForwardedMessage import kotlinx.coroutines.* import kotlinx.coroutines.flow.* diff --git a/GetMeBot/build.gradle b/GetMeBot/build.gradle index e30ee88..9733614 100644 --- a/GetMeBot/build.gradle +++ b/GetMeBot/build.gradle @@ -20,5 +20,5 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + implementation "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } diff --git a/GetMeBot/src/main/kotlin/GetMeBot.kt b/GetMeBot/src/main/kotlin/GetMeBot.kt index 2e9f75b..7229172 100644 --- a/GetMeBot/src/main/kotlin/GetMeBot.kt +++ b/GetMeBot/src/main/kotlin/GetMeBot.kt @@ -1,5 +1,5 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.getMe -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.api.bot.getMe +import dev.inmo.tgbotapi.extensions.api.telegramBot /** * This is one of the most easiest bot - it will just print information about itself diff --git a/HelloBot/build.gradle b/HelloBot/build.gradle index e30ee88..9733614 100644 --- a/HelloBot/build.gradle +++ b/HelloBot/build.gradle @@ -20,5 +20,5 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + implementation "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } diff --git a/HelloBot/src/main/kotlin/HelloBot.kt b/HelloBot/src/main/kotlin/HelloBot.kt index 9651fb0..22c2b0b 100644 --- a/HelloBot/src/main/kotlin/HelloBot.kt +++ b/HelloBot/src/main/kotlin/HelloBot.kt @@ -1,14 +1,16 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.chat.get.getChat -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.sendTextMessage -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.formatting.linkMarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.formatting.textMentionMarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.safely -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling -import com.github.insanusmokrassar.TelegramBotAPI.types.ParseMode.MarkdownV2 -import com.github.insanusmokrassar.TelegramBotAPI.types.User -import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.* -import com.github.insanusmokrassar.TelegramBotAPI.utils.extensions.escapeMarkdownV2Common +import dev.inmo.tgbotapi.extensions.api.chat.get.getChat +import dev.inmo.tgbotapi.extensions.api.chat.get.getChatAdministrators +import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage +import dev.inmo.tgbotapi.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.utils.formatting.linkMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.formatting.textMentionMarkdownV2 +import dev.inmo.tgbotapi.extensions.utils.safely +import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling +import dev.inmo.tgbotapi.types.ParseMode.MarkdownV2 +import dev.inmo.tgbotapi.types.User +import dev.inmo.tgbotapi.types.chat.abstracts.* +import dev.inmo.tgbotapi.types.toChatId +import dev.inmo.tgbotapi.utils.extensions.escapeMarkdownV2Common import kotlinx.coroutines.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -23,6 +25,10 @@ suspend fun main(vararg args: String) { val scope = CoroutineScope(Dispatchers.Default) + scope.launch { + println(bot.getChatAdministrators((-1001433262056L).toChatId())) + } + bot.startGettingFlowsUpdatesByLongPolling(scope = scope) { messageFlow.onEach { safely { diff --git a/RandomFileSenderBot/build.gradle b/RandomFileSenderBot/build.gradle index 2b61893..d7bd778 100644 --- a/RandomFileSenderBot/build.gradle +++ b/RandomFileSenderBot/build.gradle @@ -20,5 +20,5 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + implementation "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } diff --git a/RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt b/RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt index a3b161b..0c6dceb 100644 --- a/RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt +++ b/RandomFileSenderBot/src/main/kotlin/RandomFileSenderBot.kt @@ -1,13 +1,13 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.getMe -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.setMyCommands -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media.sendDocument -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.sendTextMessage -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.safely -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.filterExactCommands -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.toInputFile -import com.github.insanusmokrassar.TelegramBotAPI.types.BotCommand +import dev.inmo.tgbotapi.extensions.api.bot.getMe +import dev.inmo.tgbotapi.extensions.api.bot.setMyCommands +import dev.inmo.tgbotapi.extensions.api.send.media.sendDocument +import dev.inmo.tgbotapi.extensions.api.send.sendTextMessage +import dev.inmo.tgbotapi.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.utils.safely +import dev.inmo.tgbotapi.extensions.utils.updates.filterExactCommands +import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling +import dev.inmo.tgbotapi.requests.abstracts.toInputFile +import dev.inmo.tgbotapi.types.BotCommand import kotlinx.coroutines.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/ResenderBot/ResenderBotLib/build.gradle b/ResenderBot/ResenderBotLib/build.gradle index 34744d2..6e620a0 100644 --- a/ResenderBot/ResenderBotLib/build.gradle +++ b/ResenderBot/ResenderBotLib/build.gradle @@ -28,7 +28,7 @@ kotlin { dependencies { implementation kotlin('stdlib') - api "com.github.insanusmokrassar:TelegramBotAPI:$telegram_bot_api_version" + api "dev.inmo:TelegramBotAPI:$telegram_bot_api_version" } } } diff --git a/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt b/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt index 6889a9d..dbbf1c5 100644 --- a/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt +++ b/ResenderBot/ResenderBotLib/src/commonMain/kotlin/ResenderBot.kt @@ -1,11 +1,11 @@ -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.bot.getMe -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.send.media.sendMediaGroup -import com.github.insanusmokrassar.TelegramBotAPI.extensions.api.telegramBot -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.safely -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.shortcuts.* -import com.github.insanusmokrassar.TelegramBotAPI.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent +import dev.inmo.tgbotapi.extensions.api.bot.getMe +import dev.inmo.tgbotapi.extensions.api.send.media.sendMediaGroup +import dev.inmo.tgbotapi.extensions.api.telegramBot +import dev.inmo.tgbotapi.extensions.utils.safely +import dev.inmo.tgbotapi.extensions.utils.shortcuts.* +import dev.inmo.tgbotapi.extensions.utils.updates.retrieving.startGettingFlowsUpdatesByLongPolling +import dev.inmo.tgbotapi.types.message.content.abstracts.MediaGroupContent +import dev.inmo.tgbotapi.types.message.content.abstracts.MessageContent import kotlinx.coroutines.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/gradle.properties b/gradle.properties index 27787cf..41bc2ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ kotlin.code.style=official org.gradle.parallel=true kotlin_version=1.4.10 -telegram_bot_api_version=0.28.5 +telegram_bot_api_version=0.29.0