From cb84fd0884dcf79a3624066a4614b42d8c19e809 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 27 Feb 2023 20:36:03 +0600 Subject: [PATCH 1/3] update dependencies --- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 772ad6e..3e82a14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx768m -kotlin_version=1.7.22 -telegram_bot_api_version=5.2.1 -micro_utils_version=0.16.10 -serialization_version=1.4.1 +kotlin_version=1.8.10 +telegram_bot_api_version=6.0.0-branch_6.0.0-build1463 +micro_utils_version=0.17.0-branch_0.17.0-build381 +serialization_version=1.5.0 ktor_version=2.2.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c08cdc9..d2d5d93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip From d8c90ef377edfe61c1574f23513820fb4c81e12c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 27 Feb 2023 22:38:05 +0600 Subject: [PATCH 2/3] check and a little update --- .../src/main/kotlin/ForwardInfoSenderBot.kt | 13 +++++++++++-- RightsChangerBot/src/main/kotlin/RightsChanger.kt | 6 +++++- gradle.properties | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt b/ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt index 5723b0f..c03ed3d 100644 --- a/ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt +++ b/ForwardInfoSenderBot/src/main/kotlin/ForwardInfoSenderBot.kt @@ -1,12 +1,14 @@ import dev.inmo.tgbotapi.extensions.api.send.reply import dev.inmo.tgbotapi.extensions.behaviour_builder.telegramBotWithBehaviourAndLongPolling import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onContentMessage -import dev.inmo.tgbotapi.extensions.utils.formatting.* +import dev.inmo.tgbotapi.extensions.utils.formatting.makeLink import dev.inmo.tgbotapi.types.chat.CommonBot import dev.inmo.tgbotapi.types.chat.CommonUser import dev.inmo.tgbotapi.types.chat.ExtendedBot import dev.inmo.tgbotapi.types.message.* +import dev.inmo.tgbotapi.utils.buildEntities import dev.inmo.tgbotapi.utils.code +import dev.inmo.tgbotapi.utils.link import dev.inmo.tgbotapi.utils.regular import kotlinx.coroutines.* @@ -40,7 +42,14 @@ suspend fun main(vararg args: String) { is ExtendedBot -> regular("Bot ") } + code(user.id.chatId.toString()) + " (${user.firstName} ${user.lastName}: ${user.username?.username ?: "Without username"})" } - is ForwardInfo.PublicChat.FromChannel -> regular("Channel (") + code(forwardInfo.channelChat.title) + ")" + is ForwardInfo.PublicChat.FromChannel -> { + regular("Channel (") + (forwardInfo.channelChat.username ?.let { + link( + forwardInfo.channelChat.title, + makeLink(it) + ) + } ?: code(forwardInfo.channelChat.title)) + ")" + } is ForwardInfo.PublicChat.FromSupergroup -> regular("Supergroup (") + code(forwardInfo.group.title) + ")" is ForwardInfo.PublicChat.SentByChannel -> regular("Sent by channel (") + code(forwardInfo.channelChat.title) + ")" } diff --git a/RightsChangerBot/src/main/kotlin/RightsChanger.kt b/RightsChangerBot/src/main/kotlin/RightsChanger.kt index aa172c9..72cedc7 100644 --- a/RightsChangerBot/src/main/kotlin/RightsChanger.kt +++ b/RightsChangerBot/src/main/kotlin/RightsChanger.kt @@ -109,7 +109,11 @@ suspend fun main(args: Array) { } } - bot.buildBehaviourWithLongPolling { + bot.buildBehaviourWithLongPolling( + defaultExceptionsHandler = { + println(it) + } + ) { onCommand("simple", initialFilter = { it.chat is PublicChat && it.fromUserMessageOrNull() ?.user ?.id == allowedAdmin }) { val replyMessage = it.replyTo val userInReply = replyMessage ?.fromUserMessageOrNull() ?.user ?.id ?: return@onCommand diff --git a/gradle.properties b/gradle.properties index 3e82a14..5abe299 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.code.style=official org.gradle.parallel=true # Due to parallel compilation project require next amount of memory on full build -org.gradle.jvmargs=-Xmx768m +org.gradle.jvmargs=-Xmx1g kotlin_version=1.8.10 From 4e0fb1c13741e2cbbcc40b0b89ad1f6ecf1a43fa Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 27 Feb 2023 22:39:17 +0600 Subject: [PATCH 3/3] update dependencies --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5abe299..487a401 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1g kotlin_version=1.8.10 -telegram_bot_api_version=6.0.0-branch_6.0.0-build1463 -micro_utils_version=0.17.0-branch_0.17.0-build381 +telegram_bot_api_version=6.0.0 +micro_utils_version=0.17.0 serialization_version=1.5.0 ktor_version=2.2.3