feat: enhance avatar handling in notifications

diegolmello · diegolmello · commit 9a6d3ba3c554 · 2025-12-16T11:45:39.000-03:00
- Updated avatar URI generation to differentiate between direct messages and group/channel notifications, ensuring the correct avatar is fetched based on the message type.
- Refactored avatar fetching logic in NotificationService to improve clarity and maintainability.
- Added support for Communication Notifications API to update notification content with sender avatars.
diff --git a/android/app/src/main/java/chat/rocket/reactnative/notification/Ejson.java b/android/app/src/main/java/chat/rocket/reactnative/notification/Ejson.java
@@ -58,11 +58,6 @@ private MMKV getMMKV() {
     }
 
     public String getAvatarUri() {
-        if (sender == null || sender.username == null || sender.username.isEmpty()) {
-            Log.w(TAG, "Cannot generate avatar URI: sender or username is null");
-            return null;
-        }
-        
         String server = serverURL();
         if (server == null || server.isEmpty()) {
             Log.w(TAG, "Cannot generate avatar URI: serverURL is null");
@@ -77,13 +72,32 @@ public String getAvatarUri() {
             return null;
         }
         
-        String uri = server + "/avatar/" + sender.username + "?format=png&size=100&rc_token=" + userToken + "&rc_uid=" + uid;
+        String avatarPath;
         
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Generated avatar URI for user: " + sender.username);
+        // For DMs, show sender's avatar; for groups/channels, show room avatar
+        if ("d".equals(type)) {
+            // Direct message: use sender's avatar
+            if (sender == null || sender.username == null || sender.username.isEmpty()) {
+                Log.w(TAG, "Cannot generate avatar URI: sender or username is null");
+                return null;
+            }
+            avatarPath = "/avatar/" + sender.username;
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "Generated avatar URI for user: " + sender.username);
+            }
+        } else {
+            // Group/Channel/Livechat: use room avatar
+            if (rid == null || rid.isEmpty()) {
+                Log.w(TAG, "Cannot generate avatar URI: rid is null for non-DM");
+                return null;
+            }
+            avatarPath = "/avatar/room/" + rid;
+            if (BuildConfig.DEBUG) {
+                Log.d(TAG, "Generated avatar URI for room: " + rid);
+            }
         }
         
-        return uri;
+        return server + avatarPath + "?format=png&size=100&rc_token=" + userToken + "&rc_uid=" + uid;
     }
 
     public String token() {
diff --git a/ios/NotificationService/NotificationService.entitlements b/ios/NotificationService/NotificationService.entitlements
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.usernotifications.communication</key>
+	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.ios.chat.rocket</string>
diff --git a/ios/NotificationService/NotificationService.swift b/ios/NotificationService/NotificationService.swift
@@ -1,4 +1,5 @@
 import UserNotifications
+import Intents
 
 class NotificationService: UNNotificationServiceExtension {
     
@@ -8,25 +9,36 @@ class NotificationService: UNNotificationServiceExtension {
     
     // MARK: - Avatar Fetching
     
-    func fetchAvatar(from payload: Payload, completion: @escaping (UNNotificationAttachment?) -> Void) {
-        guard let username = payload.sender?.username else {
-            completion(nil)
-            return
-        }
-        
+    /// Fetches avatar image data - sender's avatar for DMs, room avatar for groups/channels
+    func fetchAvatarData(from payload: Payload, completion: @escaping (Data?) -> Void) {
         let server = payload.host.removeTrailingSlash()
         guard let credentials = Storage().getCredentials(server: server) else {
             completion(nil)
             return
         }
         
-        // Build authenticated avatar URL (URL encode username for special characters)
-        guard let encodedUsername = username.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
-            completion(nil)
-            return
+        // Build avatar path based on room type
+        let avatarPath: String
+        
+        if payload.type == .direct {
+            // Direct message: use sender's avatar
+            guard let username = payload.sender?.username,
+                  let encodedUsername = username.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
+                completion(nil)
+                return
+            }
+            avatarPath = "/avatar/\(encodedUsername)"
+        } else {
+            // Group/Channel/Livechat: use room avatar
+            guard let rid = payload.rid else {
+                completion(nil)
+                return
+            }
+            avatarPath = "/avatar/room/\(rid)"
         }
-        let avatarPath = "/avatar/\(encodedUsername)?format=png&size=100&rc_token=\(credentials.userToken)&rc_uid=\(credentials.userId)"
-        guard let avatarURL = URL(string: server + avatarPath) else {
+        
+        let fullPath = "\(avatarPath)?format=png&size=100&rc_token=\(credentials.userToken)&rc_uid=\(credentials.userId)"
+        guard let avatarURL = URL(string: server + fullPath) else {
             completion(nil)
             return
         }
@@ -44,27 +56,76 @@ class NotificationService: UNNotificationServiceExtension {
                 completion(nil)
                 return
             }
-            
-            // Save to temp file (UNNotificationAttachment requires file URL)
-            let tempDir = FileManager.default.temporaryDirectory
-            let fileName = "\(username)_avatar.png"
-            let fileURL = tempDir.appendingPathComponent(fileName)
-            
-            do {
-                try data.write(to: fileURL)
-                let attachment = try UNNotificationAttachment(
-                    identifier: "avatar",
-                    url: fileURL,
-                    options: [UNNotificationAttachmentOptionsTypeHintKey: "public.png"]
-                )
-                completion(attachment)
-            } catch {
-                completion(nil)
-            }
+            completion(data)
         }
         task.resume()
     }
     
+    // MARK: - Communication Notification
+    
+    /// Updates the notification content with sender avatar using Communication Notifications API
+    func updateNotificationAsCommunication(payload: Payload, avatarData: Data?) {
+        guard let bestAttemptContent = bestAttemptContent else { return }
+        
+        let senderName = payload.sender?.name ?? payload.senderName ?? "Unknown"
+        let senderId = payload.sender?._id ?? ""
+        let senderUsername = payload.sender?.username ?? ""
+        
+        // Create avatar image for the sender
+        var senderImage: INImage? = nil
+        if let data = avatarData {
+            senderImage = INImage(imageData: data)
+        }
+        
+        // Create the sender as an INPerson
+        let sender = INPerson(
+            personHandle: INPersonHandle(value: senderUsername, type: .unknown),
+            nameComponents: nil,
+            displayName: senderName,
+            image: senderImage,
+            contactIdentifier: nil,
+            customIdentifier: senderId
+        )
+        
+        // Determine conversation name (room name for groups, sender name for DMs)
+        let conversationName: String
+        if payload.type == .group, let roomName = payload.name {
+            conversationName = roomName
+        } else {
+            conversationName = senderName
+        }
+        
+        // Create the messaging intent
+        let intent = INSendMessageIntent(
+            recipients: nil,
+            outgoingMessageType: .outgoingMessageText,
+            content: bestAttemptContent.body,
+            speakableGroupName: INSpeakableString(spokenPhrase: conversationName),
+            conversationIdentifier: payload.rid ?? "",
+            serviceName: nil,
+            sender: sender,
+            attachments: nil
+        )
+        
+        // If it's a group chat, set the group avatar (optional, uses sender avatar as fallback)
+        if payload.type == .group {
+            intent.setImage(senderImage, forParameterNamed: \.speakableGroupName)
+        }
+        
+        // Donate the interaction for Siri suggestions
+        let interaction = INInteraction(intent: intent, response: nil)
+        interaction.direction = .incoming
+        interaction.donate(completion: nil)
+        
+        // Update the notification content with the intent
+        do {
+            let updatedContent = try bestAttemptContent.updating(from: intent)
+            self.bestAttemptContent = updatedContent
+        } catch {
+            // Failed to update with intent, will fall back to regular notification
+        }
+    }
+    
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
         self.contentHandler = contentHandler
         bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
@@ -154,9 +215,7 @@ class NotificationService: UNNotificationServiceExtension {
         bestAttemptContent.body = String(format: NSLocalizedString("Incoming call from %@", comment: ""), callerName)
         bestAttemptContent.categoryIdentifier = "VIDEOCONF"
         bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName("ringtone.mp3"))
-        if #available(iOS 15.0, *) {
-            bestAttemptContent.interruptionLevel = .timeSensitive
-        }
+        bestAttemptContent.interruptionLevel = .timeSensitive
         
         contentHandler?(bestAttemptContent)
     }
@@ -185,13 +244,11 @@ class NotificationService: UNNotificationServiceExtension {
             }
         }
         
-        // Fetch avatar and deliver notification
-        fetchAvatar(from: payload) { [weak self] attachment in
+        // Fetch avatar and deliver notification with Communication Notification style
+        fetchAvatarData(from: payload) { [weak self] avatarData in
             guard let self = self else { return }
             
-            if let attachment = attachment {
-                self.bestAttemptContent?.attachments = [attachment]
-            }
+            self.updateNotificationAsCommunication(payload: payload, avatarData: avatarData)
             
             if let bestAttemptContent = self.bestAttemptContent {
                 self.contentHandler?(bestAttemptContent)
diff --git a/ios/RocketChatRN/RocketChatRN.entitlements b/ios/RocketChatRN/RocketChatRN.entitlements
@@ -12,6 +12,8 @@
 	<array>
 		<string>applinks:go.rocket.chat</string>
 	</array>
+	<key>com.apple.developer.usernotifications.communication</key>
+	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.ios.chat.rocket</string>
