From f619e6d77d34e82b4aadf75450b029a8567c2842 Mon Sep 17 00:00:00 2001 From: overtake Date: Tue, 2 May 2017 21:54:32 +0300 Subject: [PATCH] no message --- TelegramCore/EnqueueMessage.swift | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/TelegramCore/EnqueueMessage.swift b/TelegramCore/EnqueueMessage.swift index b7eeadf3c3..5b80c37e6f 100644 --- a/TelegramCore/EnqueueMessage.swift +++ b/TelegramCore/EnqueueMessage.swift @@ -229,17 +229,22 @@ func enqueueMessages(modifier: Modifier, account: Account, peerId: PeerId, messa attributes.append(ForwardSourceInfoAttribute(messageId: sourceMessage.id)) attributes.append(contentsOf: filterMessageAttributesForForwardedMessage(sourceMessage.attributes)) - let forwardInfo: StoreMessageForwardInfo + let forwardInfo: StoreMessageForwardInfo? if let sourceForwardInfo = sourceMessage.forwardInfo { forwardInfo = StoreMessageForwardInfo(authorId: sourceForwardInfo.author.id, sourceId: sourceForwardInfo.source?.id, sourceMessageId: sourceForwardInfo.sourceMessageId, date: sourceForwardInfo.date) } else { - var sourceId:PeerId? = nil - var sourceMessageId:MessageId? = nil - if let peer = messageMainPeer(sourceMessage) as? TelegramChannel, case .broadcast = peer.info { - sourceId = peer.id - sourceMessageId = sourceMessage.id + if sourceMessage.id.peerId != account.peerId { + var sourceId:PeerId? = nil + var sourceMessageId:MessageId? = nil + if let peer = messageMainPeer(sourceMessage) as? TelegramChannel, case .broadcast = peer.info { + sourceId = peer.id + sourceMessageId = sourceMessage.id + } + forwardInfo = StoreMessageForwardInfo(authorId: author.id, sourceId: sourceId, sourceMessageId: sourceMessageId, date: sourceMessage.timestamp) + } else { + forwardInfo = nil } - forwardInfo = StoreMessageForwardInfo(authorId: author.id, sourceId: sourceId, sourceMessageId: sourceMessageId, date: sourceMessage.timestamp) + } var entitiesAttribute: TextEntitiesMessageAttribute?