updated notification subject parsing to support newline separators for sender and message, while maintaining a fallback for legacy colon-delimited formats.

2026-07-05 23:57:48 +02:00
parent 5952c6619f
commit 614ab159af
1 changed files with 13 additions and 1 deletions
@@ -150,8 +150,20 @@ class NotificationService: UNNotificationServiceExtension {
        // delivered notifications).
    }

-    /// Splits `"Sender: message"` into its parts; falls back to a generic sender.
+    /// Splits a Talk subject into header and message. nextcloud/spreed's
+    /// Notifier separates them with a NEWLINE — `"{user}\n{message}"` for 1:1
+    /// chats, `"{user} in {call}\n{message}"` for groups (verified against
+    /// spreed; mirrors parseTalkSubject in lib/push/push_subject.dart). The
+    /// legacy `": "` form is kept as fallback for older payloads.
    private func splitSender(_ subject: String) -> (String, String) {
+        if let range = subject.range(of: "\n") {
+            let sender = String(subject[..<range.lowerBound])
+                .trimmingCharacters(in: .whitespaces)
+            let message = String(subject[range.upperBound...])
+            if !sender.isEmpty && !message.isEmpty {
+                return (sender, message)
+            }
+        }
        if let range = subject.range(of: ": ") {
            let sender = String(subject[..<range.lowerBound])
            let message = String(subject[range.upperBound...])