signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Batch poll vote notifications

Browse Source
This commit is contained in:
kate-signal 2025-11-11 14:31:39 -05:00 committed by GitHub
parent 981e0217d4
commit 3defbb77a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SignalServiceKit/Notifications/NotificationPresenterImpl.swift
View File

@ -83,6 +83,7 @@ public struct AppNotificationUserInfo {
public var storyMessageId: String?
public var storyTimestamp: UInt64?
public var threadId: String?
public var voteAuthorServiceIdBinary: Data?
public init() {
}
@ -110,6 +111,7 @@ public struct AppNotificationUserInfo {
self.storyMessageId = userInfo[UserInfoKey.storyMessageId] as? String
self.storyTimestamp = userInfo[UserInfoKey.storyTimestamp] as? UInt64
self.threadId = userInfo[UserInfoKey.threadId] as? String
self.voteAuthorServiceIdBinary = userInfo[UserInfoKey.voteAuthorServiceIdBinary] as? Data
}
private enum UserInfoKey {
@ -123,6 +125,7 @@ public struct AppNotificationUserInfo {
public static let storyMessageId = "Signal.AppNotificationsUserInfoKey.storyMessageId"
public static let storyTimestamp = "Signal.AppNotificationsUserInfoKey.storyTimestamp"
public static let threadId = "Signal.AppNotificationsUserInfoKey.threadId"
public static let voteAuthorServiceIdBinary = "Signal.AppNotificationsUserInfoKey.voteAuthorServiceIdBinary"
}
func build() -> [String: Any] {
@ -157,6 +160,9 @@ public struct AppNotificationUserInfo {
if let threadId {
result[UserInfoKey.threadId] = threadId
}
if let voteAuthorServiceIdBinary {
result[UserInfoKey.voteAuthorServiceIdBinary] = voteAuthorServiceIdBinary
}
return result
}
}
@ -727,10 +733,16 @@ public class NotificationPresenterImpl: NotificationPresenter {
var userInfo = AppNotificationUserInfo()
let threadUniqueId = thread.uniqueId
userInfo.threadId = threadUniqueId
userInfo.voteAuthorServiceIdBinary = voteAuthor.serviceIdBinary
userInfo.messageId = message.uniqueId
let intent = thread.generateSendMessageIntent(context: .senderAddress(SignalServiceAddress(voteAuthor)), transaction: transaction)
enqueueNotificationAction(afterCommitting: transaction) {
if await self.presenter.existingPollVoteNotification(author: voteAuthor.serviceIdBinary, pollId: message.uniqueId) {
return
}
await self.notifyViaPresenter(
category: .pollVoteNotification,
title: notificationTitle,

15
SignalServiceKit/Notifications/UserNotificationsPresenter.swift
View File

@ -377,6 +377,21 @@ public class UserNotificationPresenter {
self.cancelSync(notificationRequests: await getNotificationsRequests(), matching: cancellation)
}
func existingPollVoteNotification(author: Data, pollId: String) async -> Bool {
let notificationRequests = await getNotificationsRequests()
for request in notificationRequests {
let userInfo = AppNotificationUserInfo(request.content.userInfo)
if let requestPollAuthor = userInfo.voteAuthorServiceIdBinary,
let requestPollId = userInfo.messageId,
requestPollAuthor == author,
requestPollId == pollId
{
return true
}
}
return false
}
@discardableResult
private func cancelSync(
notificationRequests: [UNNotificationRequest],