feat(macOS): Notification click

Author: morajabi

apple/Config.xcconfig.template

@@ -1,2 +1,2 @@
-# Your dev API IP/hostname eg. 192.168.1.100 or mac.local
+# Your dev API IP/hostname eg. 192.168.1.100 or mac.local get it via hostname shell command
 DEV_HOST = $(API_BASE_URL_VALUE) 

apple/InlineKit/Sources/InlineKit/Models/Message.swift

@@ -153,7 +153,6 @@ public extension Message {
       if let existing = try? Message
         .fetchOne(db, key: ["messageId": self.messageId, "chatId": self.chatId])
       {
-        print("found existing message \(existing)")
         self.globalId = existing.globalId
       }
     }

apple/InlineMac/AppDelegate.swift

@@ -8,14 +8,14 @@ import UserNotifications
 class AppDelegate: NSObject, NSApplicationDelegate {
   let notifications = NotificationsManager()
   let navigation: NavigationModel = .shared
+  let log = Log.scoped("AppDelegate")
 
   func applicationWillFinishLaunching(_ notification: Notification) {
     // Disable native tabbing
     NSWindow.allowsAutomaticWindowTabbing = false
 
     // Setup Notifications Delegate
-    notifications.setup()
-    UNUserNotificationCenter.current().delegate = notifications
+    setupNotifications()
   }
 
   func applicationDidFinishLaunching(_ aNotification: Notification) {
@@ -31,12 +31,24 @@ class AppDelegate: NSObject, NSApplicationDelegate {
   func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
     return true
   }
+}
 
+// MARK: - Notifications
+
+extension AppDelegate {
+  func setupNotifications() {
+    notifications.setup()
+    notifications.onNotificationReceived { response in
+      self.handleNotification(response)
+    }
+    UNUserNotificationCenter.current().delegate = notifications
+  }
+  
   func application(
     _ application: NSApplication,
     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
   ) {
-    Log.shared.debug("Registered for remote notifications: \(deviceToken)")
+    log.debug("Registered for remote notifications: \(deviceToken)")
 
     notifications.didRegisterForRemoteNotifications(deviceToken: deviceToken)
   }
@@ -45,6 +57,28 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     _ application: NSApplication,
     didFailToRegisterForRemoteNotificationsWithError error: Error
   ) {
-    Log.shared.error("Failed to register for remote notifications \(error)")
+    log.error("Failed to register for remote notifications \(error)")
+  }
+
+  func handleNotification(_ response: UNNotificationResponse) {
+    log.debug("Received notification: \(response)")
+
+    // TODO: Navigate
+    guard let userInfo = response.notification.request.content.userInfo as? [String: Any] else {
+      return
+    }
+
+    if let peerId = getPeerFromNotification(userInfo) {
+      navigation.select(.chat(peer: peerId))
+      // TODO: Handle spaceId
+    }
+  }
+
+  func getPeerFromNotification(_ userInfo: [String: Any]) -> Peer? {
+    if let peerUserId = userInfo["userId"] as? Int64 {
+      return .user(id: peerUserId)
+    } else {
+      return nil
+    }
   }
 }

apple/InlineMac/Utils/Notifications.swift

@@ -21,6 +21,16 @@ class NotificationsManager: NSObject {
     center.delegate = self
     log.debug("Notifications manager setup completed.")
   }
+
+  var onNotificationReceivedAction: ((_ response: UNNotificationResponse) -> Void)?
+
+  func onNotificationReceived(action: @escaping (_ response: UNNotificationResponse) -> Void) {
+    if onNotificationReceivedAction != nil {
+      log.error("onNotificationReceived action already attached. It must only be called once.")
+    }
+    log.trace("Attached onNotificationReceived action")
+    onNotificationReceivedAction = action
+  }
 }
 
 // Delegate
@@ -40,12 +50,11 @@ extension NotificationsManager: UNUserNotificationCenterDelegate {
   func userNotificationCenter(
     _: UNUserNotificationCenter,
     didReceive response: UNNotificationResponse,
-    withCompletionHandler _: @escaping () -> Void
+    withCompletionHandler completionHandler: @escaping () -> Void
   ) {
     log.debug("Received notification: \(response.notification.request.content.userInfo)")
-    let userInfo = response.notification.request.content.userInfo
-
-    // Handle the notification here.
+    self.onNotificationReceivedAction.map { $0(response) }
+    completionHandler() // Is this correct?
   }
 }
 

apple/InlineMac/Views/Chat/AppKit/MessageTableView.swift

@@ -138,8 +138,6 @@ class MessagesTableView: NSViewController {
   private func scrollToBottom(animated: Bool) {
     guard messages.count > 0 else { return }
 
-    print("scrollTopInset \(scrollView.contentInsets.top)")
-    
     let lastRow = messages.count - 1
 
     if animated {

server/src/methods/sendMessage.ts

@@ -273,9 +273,8 @@ const sendPushNotificationToUser = async ({
         session.clientType === "macos"
           ? isProd
             ? "chat.inline.InlineMac"
-            : "chat.inline.InlineMac"
-          : // : "chat.inline.InlineMac.debug"
-            "chat.inline.InlineIOS"
+            : "chat.inline.InlineMac.debug"
+          : "chat.inline.InlineIOS"
 
       // Configure notification
       const notification = new APN.Notification()