ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix title

Browse Source
This commit is contained in:
Ali 2022-10-22 19:03:28 +04:00
parent 9a92257b6f
commit d9ab563c94
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/NotificationService/Sources/NotificationService.swift
View File

@ -464,13 +464,16 @@ private struct NotificationContent: CustomStringConvertible {
return string return string
} }
mutating func addSenderInfo(mediaBox: MediaBox, accountPeerId: PeerId, peer: Peer, contactIdentifier: String?) { mutating func addSenderInfo(mediaBox: MediaBox, accountPeerId: PeerId, peer: Peer, topicTitle: String?, contactIdentifier: String?) {
if #available(iOS 15.0, *) { if #available(iOS 15.0, *) {
let image = peerAvatar(mediaBox: mediaBox, accountPeerId: accountPeerId, peer: peer) let image = peerAvatar(mediaBox: mediaBox, accountPeerId: accountPeerId, peer: peer)
self.senderImage = image self.senderImage = image
var displayName: String = peer.debugDisplayTitle var displayName: String = peer.debugDisplayTitle
if let topicTitle {
displayName = "\(topicTitle) (\(displayName))"
}
if self.silent { if self.silent {
displayName = "\(displayName) 🔕" displayName = "\(displayName) 🔕"
} }
@ -831,6 +834,7 @@ private final class NotificationServiceHandler {
var downloadNotificationSound: (file: TelegramMediaFile, path: String, fileName: String)? var downloadNotificationSound: (file: TelegramMediaFile, path: String, fileName: String)?
var interactionAuthorId: PeerId? var interactionAuthorId: PeerId?
var topicTitle: String?
struct CallData { struct CallData {
var id: Int64 var id: Int64
@ -942,11 +946,12 @@ private final class NotificationServiceHandler {
if let aps = payloadJson["aps"] as? [String: Any], let peerId = peerId { if let aps = payloadJson["aps"] as? [String: Any], let peerId = peerId {
var content: NotificationContent = NotificationContent(isLockedMessage: isLockedMessage) var content: NotificationContent = NotificationContent(isLockedMessage: isLockedMessage)
if let alert = aps["alert"] as? [String: Any] { if let alert = aps["alert"] as? [String: Any] {
if let topicTitle = payloadJson["topic_title"] as? String { if let topicTitleValue = payloadJson["topic_title"] as? String {
topicTitle = topicTitleValue
if let title = alert["title"] as? String { if let title = alert["title"] as? String {
content.title = "\(topicTitle) (\(title))" content.title = "\(topicTitleValue) (\(title))"
} else { } else {
content.title = topicTitle content.title = topicTitleValue
} }
} else { } else {
content.title = alert["title"] as? String content.title = alert["title"] as? String
@ -999,6 +1004,9 @@ private final class NotificationServiceHandler {
content.threadId = threadId content.threadId = threadId
} }
if let topicIdValue = payloadJson["topic_id"] as? String, let topicId = Int(topicIdValue) { if let topicIdValue = payloadJson["topic_id"] as? String, let topicId = Int(topicIdValue) {
if let threadId = content.threadId {
content.threadId = "\(threadId):\(topicId)"
}
content.userInfo["threadId"] = Int32(clamping: topicId) content.userInfo["threadId"] = Int32(clamping: topicId)
} }
@ -1399,7 +1407,7 @@ private final class NotificationServiceHandler {
return true return true
}) })
content.addSenderInfo(mediaBox: stateManager.postbox.mediaBox, accountPeerId: stateManager.accountPeerId, peer: peer, contactIdentifier: foundLocalId) content.addSenderInfo(mediaBox: stateManager.postbox.mediaBox, accountPeerId: stateManager.accountPeerId, peer: peer, topicTitle: topicTitle, contactIdentifier: foundLocalId)
} }
} }