From 1d5c433a1aed41c44f17f059c882d9ea261ddb5e Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuartb@hey.com>
Date: Wed, 23 Dec 2020 21:44:45 +0800
Subject: [PATCH] adds macOS notification behaviour

---
 Mac/AppDelegate.swift                         | 56 ++++++++++++++++++-
 .../xcshareddata/swiftpm/Package.resolved     |  4 +-
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index dd31e23ac..b5eb7e17e 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -455,7 +455,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
     }
 	
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-		mainWindowController?.handle(response)
+		
+		let userInfo = response.notification.request.content.userInfo
+		
+		switch response.actionIdentifier {
+		case "MARK_AS_READ":
+			handleMarkAsRead(userInfo: userInfo)
+		case "MARK_AS_STARRED":
+			handleMarkAsStarred(userInfo: userInfo)
+		default:
+			mainWindowController?.handle(response)
+		}
 		completionHandler()
     }
 	
@@ -791,3 +801,47 @@ extension AppDelegate: NSWindowRestoration {
 	}
 	
 }
+
+// Handle Notification Actions
+
+private extension AppDelegate {
+	
+	func handleMarkAsRead(userInfo: [AnyHashable: Any]) {
+		guard let articlePathUserInfo = userInfo[UserInfoKey.articlePath] as? [AnyHashable : Any],
+			let accountID = articlePathUserInfo[ArticlePathKey.accountID] as? String,
+			let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String else {
+				return
+		}
+		
+		let account = AccountManager.shared.existingAccount(with: accountID)
+		guard account != nil else {
+			os_log(.debug, "No account found from notification.")
+			return
+		}
+		let article = try? account!.fetchArticles(.articleIDs([articleID]))
+		guard article != nil else {
+			os_log(.debug, "No article found from search using %@", articleID)
+			return
+		}
+		account!.markArticles(article!, statusKey: .read, flag: true)
+	}
+	
+	func handleMarkAsStarred(userInfo: [AnyHashable: Any]) {
+		guard let articlePathUserInfo = userInfo[UserInfoKey.articlePath] as? [AnyHashable : Any],
+			let accountID = articlePathUserInfo[ArticlePathKey.accountID] as? String,
+			let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String else {
+				return
+		}
+		let account = AccountManager.shared.existingAccount(with: accountID)
+		guard account != nil else {
+			os_log(.debug, "No account found from notification.")
+			return
+		}
+		let article = try? account!.fetchArticles(.articleIDs([articleID]))
+		guard article != nil else {
+			os_log(.debug, "No article found from search using %@", articleID)
+			return
+		}
+		account!.markArticles(article!, statusKey: .starred, flag: true)
+	}
+}
diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 5d327bbb9..a6fee66e1 100644
--- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/tid-kijyun/Kanna.git",
         "state": {
           "branch": null,
-          "revision": "4a80ebe93b6966d5083394fcaaaff57a2fcec935",
-          "version": "5.2.3"
+          "revision": "c657fb9f5827ef138068215c76ad0bb62bbc92da",
+          "version": "5.2.4"
         }
       },
       {