Merge branch 'master' into holes

This commit is contained in:
Peter
2019-03-24 20:50:05 +04:00
36 changed files with 802 additions and 895 deletions

View File

@@ -86,7 +86,7 @@ func makeBridgeMedia(message: Message, strings: PresentationStrings, chatPeer: P
if let forward = message.forwardInfo {
let bridgeForward = TGBridgeForwardedMessageMediaAttachment()
bridgeForward.peerId = makeBridgeIdentifier(forward.author.id)
bridgeForward.peerId = forward.author.flatMap({ makeBridgeIdentifier($0.id) }) ?? 0
if let sourceMessageId = forward.sourceMessageId {
bridgeForward.mid = sourceMessageId.id
}