From b913f66b1ec004d1fdb4a9641757c393ccd04767 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 15 Aug 2026 14:22:35 +0600 Subject: [PATCH] fixes --- .../kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt index 936db50466..800a00607a 100644 --- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt +++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/ReplyParameters.kt @@ -2,6 +2,8 @@ package dev.inmo.tgbotapi.types import dev.inmo.tgbotapi.abstracts.TextedInput import dev.inmo.tgbotapi.abstracts.WithMessageId +import dev.inmo.tgbotapi.types.chat.Bot +import dev.inmo.tgbotapi.types.chat.PreviewBot import dev.inmo.tgbotapi.types.checklists.ChecklistTaskId import dev.inmo.tgbotapi.types.message.ParseMode import dev.inmo.tgbotapi.types.message.RawMessageEntity @@ -339,5 +341,12 @@ fun Message.ephemeralReplyParametersOrNull( */ val Message.ephemeralReplyReceiverUserIdOrNull: UserId? get() = (this as? PossiblyEphemeralMessage) ?.takeIf { it.ephemeralMessageId != null } ?.let { - it.receiverUser ?.id ?: (this as? OptionallyFromUserMessage) ?.from ?.id + val receiverUser = it.receiverUser + val thisAsOptionallyFromUserMessage = this as? OptionallyFromUserMessage + val from = thisAsOptionallyFromUserMessage ?.from + when { + receiverUser != null && receiverUser !is PreviewBot && from !is Bot -> receiverUser.id + from != null && from !is PreviewBot && from !is Bot -> from.id + else -> null + } }