InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-06-28 12:27:49 +00:00
Code Releases Activity

refactor of contentConverter

Browse Source
This commit is contained in:
InsanusMokrassar 2021-10-14 22:57:04 +06:00
parent 2a33b22afb
commit 5a192b00d4
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,7 +7,7 @@
* `Common`: * `Common`:
* `Version`: * `Version`:
* `Serialization`: `1.2.2` -> `1.3.0` * `Serialization`: `1.2.2` -> `1.3.0`
* `MicroUtils`: `0.5.28` -> `0.7.0` * `MicroUtils`: `0.5.28` -> `0.7.1`
* `Klock`: `2.4.3` -> `2.4.5` * `Klock`: `2.4.3` -> `2.4.5`
* `Core`: * `Core`:
* `PayInlineKeyboardButton#pay` now is deprecated * `PayInlineKeyboardButton#pay` now is deprecated

19
tgbotapi.extensions.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/expectations/WaitContent.kt
View File

@ -16,6 +16,7 @@ import dev.inmo.tgbotapi.types.update.MediaGroupUpdates.SentMediaGroupUpdate
import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate import dev.inmo.tgbotapi.types.update.abstracts.BaseSentMessageUpdate
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.toList import kotlinx.coroutines.flow.toList
import kotlin.reflect.KClass
typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T? typealias CommonMessageToContentMapper<T> = suspend CommonMessage<T>.() -> T?
@ -54,19 +55,17 @@ private suspend fun <O> BehaviourContext.waitCommonMessage(
internal inline fun <reified T : MessageContent> contentConverter( internal inline fun <reified T : MessageContent> contentConverter(
noinline mapper: CommonMessageToContentMapper<T>? = null noinline mapper: CommonMessageToContentMapper<T>? = null
): suspend CommonMessage<MessageContent>.() -> T? = { ): suspend CommonMessage<MessageContent>.() -> T? = mapper ?.let {
if (content is T) { {
@Suppress("UNCHECKED_CAST") if (content is T) {
val message = (this as CommonMessage<T>) @Suppress("UNCHECKED_CAST")
if (mapper == null) { val message = (this as CommonMessage<T>)
message.content
} else {
safelyWithoutExceptions { mapper(message) } safelyWithoutExceptions { mapper(message) }
} else {
null
} }
} else {
null
} }
} } ?: { content as? T }
private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContent( private suspend inline fun <reified T : MessageContent> BehaviourContext.waitContent(
count: Int = 1, count: Int = 1,