From 562bc0357d56be1b285361419c0ab972faf61437 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 30 Apr 2019 12:53:56 +0800 Subject: [PATCH] one more fix for forwarded messages --- .../TelegramBotAPI/types/message/RawMessage.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt index b9220fdadd..2bfaea70b5 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/RawMessage.kt @@ -134,8 +134,12 @@ data class RawMessage( @Transient private val forwarded: ForwardedMessage? by lazy { forward_date ?: return@lazy null // According to the documentation, now any forwarded message contains this field - forward_from ?.let { - forward_from_message_id ?: throw IllegalStateException("For common forwarded messages message id of the original message declared as set up required") + forward_sender_name ?.let { + AnonymousForwardedMessage( + forward_date, + forward_sender_name + ) + } ?: forward_from_message_id ?.let { forward_from_chat ?.let { ForwardedFromChannelMessage( forward_from_message_id, @@ -147,12 +151,7 @@ data class RawMessage( } ?: CommonForwardedMessage( forward_from_message_id, forward_date, - forward_from - ) - } ?: forward_sender_name ?.let { - AnonymousForwardedMessage( - forward_date, - forward_sender_name + forward_from ?: throw IllegalStateException("For common forwarded messages author of original message declared as set up required") ) } }