ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-23 22:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ee1cb8fdf68eedb7197fd3fb18b42b66925e0cc0'

Browse Source 
# Conflicts:
#	TelegramCore/StandaloneSendMessage.swift
This commit is contained in:
Peter 2017-03-30 18:00:14 +03:00
commit c20a880863
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TelegramCore/AccountStateManager.swift
View File

@ -693,8 +693,6 @@ public func messageForNotification(modifier: Modifier, id: MessageId, alwaysRetu
Logger.shared.log("AccountStateManager", "notification settings for \(id.peerId) are undefined") Logger.shared.log("AccountStateManager", "notification settings for \(id.peerId) are undefined")
} }
if notify {
let message = modifier.getMessage(id) let message = modifier.getMessage(id)
if let message = message { if let message = message {
var foundReadState = false var foundReadState = false
@ -710,16 +708,15 @@ public func messageForNotification(modifier: Modifier, id: MessageId, alwaysRetu
Logger.shared.log("AccountStateManager", "read state for \(id.peerId) is undefined") Logger.shared.log("AccountStateManager", "read state for \(id.peerId) is undefined")
} }
if notify || message.flags.contains(.Personal) {
return (message, isUnread) return (message, isUnread)
} else {
return (alwaysReturnMessage ? message : nil, false)
}
} else { } else {
Logger.shared.log("AccountStateManager", "notification message doesn't exist") Logger.shared.log("AccountStateManager", "notification message doesn't exist")
return (nil, false) return (nil, false)
} }
} else {
var message: Message?
if alwaysReturnMessage {
message = modifier.getMessage(id)
}
return (message, false)
}
} }

2
TelegramCore/StandaloneSendMessage.swift
View File

@ -49,7 +49,7 @@ private func sendMessageContent(account: Account, peerId: PeerId, attributes: [M
if peerId.namespace == Namespaces.Peer.SecretChat { if peerId.namespace == Namespaces.Peer.SecretChat {
return .complete() return .complete()
} else if let peer = modifier.getPeer(peerId), let inputPeer = apiInputPeer(peer) { } else if let peer = modifier.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
var uniqueId: Int64 = 0 var uniqueId: Int64 = arc4random64()
//var forwardSourceInfoAttribute: ForwardSourceInfoAttribute? //var forwardSourceInfoAttribute: ForwardSourceInfoAttribute?
var messageEntities: [Api.MessageEntity]? var messageEntities: [Api.MessageEntity]?
var replyMessageId: Int32? var replyMessageId: Int32?