Merge pull request #160 from InsanusMokrassar/3.3.0

3.3.0
This commit is contained in:
InsanusMokrassar 2022-10-23 11:41:44 +06:00 committed by GitHub
commit 50ad281132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions

View File

@ -2,8 +2,7 @@ import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandler
import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions
import dev.inmo.tgbotapi.extensions.api.bot.getMe import dev.inmo.tgbotapi.extensions.api.bot.getMe
import dev.inmo.tgbotapi.bot.ktor.telegramBot import dev.inmo.tgbotapi.bot.ktor.telegramBot
import dev.inmo.tgbotapi.extensions.api.get.getCustomEmojiStickerOrNull import dev.inmo.tgbotapi.extensions.api.get.*
import dev.inmo.tgbotapi.extensions.api.get.getStickerSet
import dev.inmo.tgbotapi.extensions.api.send.* import dev.inmo.tgbotapi.extensions.api.send.*
import dev.inmo.tgbotapi.extensions.behaviour_builder.* import dev.inmo.tgbotapi.extensions.behaviour_builder.*
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.* import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.*
@ -14,7 +13,10 @@ import dev.inmo.tgbotapi.utils.bold
import dev.inmo.tgbotapi.utils.buildEntities import dev.inmo.tgbotapi.utils.buildEntities
import kotlinx.coroutines.* import kotlinx.coroutines.*
fun StickerSet.buildInfo() = buildEntities { fun StickerSet?.buildInfo() = buildEntities {
if (this@buildInfo == null) {
bold("Looks like this stickerset has been removed")
} else {
bold("StickerSet name: ") + "${name}\n" bold("StickerSet name: ") + "${name}\n"
bold("StickerSet title: ") + "${title}\n" bold("StickerSet title: ") + "${title}\n"
bold( bold(
@ -26,6 +28,7 @@ fun StickerSet.buildInfo() = buildEntities {
} }
) + " sticker set with title " + bold(title) + " and name " + bold(name) ) + " sticker set with title " + bold(title) + " and name " + bold(name)
} }
}
suspend fun activateStickerInfoBot( suspend fun activateStickerInfoBot(
token: String, token: String,
@ -58,7 +61,7 @@ suspend fun activateStickerInfoBot(
} }
} }
onSticker { onSticker {
val stickerSetInfo = getStickerSet(it.content.media) val stickerSetInfo = getStickerSetOrNull(it.content.media)
reply( reply(
it, it,
stickerSetInfo.buildInfo() stickerSetInfo.buildInfo()

View File

@ -4,8 +4,8 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx768m org.gradle.jvmargs=-Xmx768m
kotlin_version=1.7.10 kotlin_version=1.7.20
telegram_bot_api_version=3.2.7 telegram_bot_api_version=3.3.0
micro_utils_version=0.12.17 micro_utils_version=0.13.1
serialization_version=1.4.0 serialization_version=1.4.1
ktor_version=2.1.2 ktor_version=2.1.2