From 30c138029e14207d38e06446ea51ae28845877de Mon Sep 17 00:00:00 2001 From: vasya Date: Tue, 29 Jun 2021 00:37:53 +0300 Subject: [PATCH] add asFromUserMessage calls to Update#sourceUser --- .../extensions/utils/extensions/UpdateChatRetriever.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt index 8d2a4d5f17..aaffa37c64 100644 --- a/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt +++ b/tgbotapi.extensions.utils/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/utils/extensions/UpdateChatRetriever.kt @@ -1,5 +1,6 @@ package dev.inmo.tgbotapi.extensions.utils.extensions +import dev.inmo.tgbotapi.extensions.utils.asFromUserMessage import dev.inmo.tgbotapi.extensions.utils.asUser import dev.inmo.tgbotapi.extensions.utils.shortcuts.chat import dev.inmo.tgbotapi.types.User @@ -30,11 +31,11 @@ fun Update.sourceChat(): Chat? = when (this) { @PreviewFeature fun Update.sourceUser(): User? = when (this) { is MediaGroupUpdate -> when (this) { - is SentMediaGroupUpdate -> data.chat?.asUser() - is EditMediaGroupUpdate -> data.chat.asUser() + is SentMediaGroupUpdate -> data.chat?.asUser() ?: data.first().asFromUserMessage()?.user + is EditMediaGroupUpdate -> data.chat.asUser() ?: data.asFromUserMessage()?.user else -> null } - is BaseMessageUpdate -> data.chat.asUser() + is BaseMessageUpdate -> data.chat.asUser() ?: data.asFromUserMessage()?.user is InlineQueryUpdate -> data.from is ChosenInlineResultUpdate -> data.user is CallbackQueryUpdate -> data.user