Notification Filtering (IOS-241)

Localization/StringsConvertor/input/Base.lproj/app.json

@@ -477,7 +477,15 @@
             "title": "Home",
             "timeline_menu": {
                 "following": "Following",
-                "local_community": "Local"
+                "local_community": "Local",
+                "lists": {
+                    "title": "Lists",
+                    "empty_message": "You don't have any Lists"
+                },
+                "hashtags": {
+                    "title": "Followed Hashtags",
+                    "empty_message": "You don't follow any Hashtags"
+                }
             },
             "timeline_pill": {
                 "offline": "Offline",
@@ -744,6 +752,30 @@
                 "silence": "Your account has been limited.",
                 "suspend": "Your account has been suspended.",
                 "learn_more": "Learn More"
+            },
+            "filtered_notification": {
+                "title": "Filtered Notifications",
+                "accept": "Accept",
+                "dismiss": "Dismiss",
+            },
+            "policy": {
+                "title": "Filter Notifications from…",
+                "not_following": {
+                    "title": "People you don't follow",
+                    "subtitle": "Until you manually approve them"
+                },
+                "no_follower": {
+                    "title": "People not following you",
+                    "subtitle": "Including people who have been following you fewer than 3 days"
+                },
+                "new_account": {
+                    "title": "New accounts",
+                    "subtitle": "Created within the past 30 days"
+                },
+                "private_mentions": {
+                    "title": "Unsolicited private mentions",
+                    "subtitle": "Filtered unless it’s in reply to your own mention or if you follow the sender"
+                }
             }
         },
         "thread": {

Localization/app.json

@@ -752,6 +752,30 @@
                 "silence": "Your account has been limited.",
                 "suspend": "Your account has been suspended.",
                 "learn_more": "Learn More"
+            },
+            "filtered_notification": {
+                "title": "Filtered Notifications",
+                "accept": "Accept",
+                "dismiss": "Dismiss",
+            },
+            "policy": {
+                "title": "Filter Notifications from…",
+                "not_following": {
+                    "title": "People you don't follow",
+                    "subtitle": "Until you manually approve them"
+                },
+                "no_follower": {
+                    "title": "People not following you",
+                    "subtitle": "Including people who have been following you fewer than 3 days"
+                },
+                "new_account": {
+                    "title": "New accounts",
+                    "subtitle": "Created within the past 30 days"
+                },
+                "private_mentions": {
+                    "title": "Unsolicited private mentions",
+                    "subtitle": "Filtered unless it’s in reply to your own mention or if you follow the sender"
+                }
             }
         },
         "thread": {

Mastodon/Coordinator/SceneCoordinator.swift

@@ -205,7 +205,12 @@ extension SceneCoordinator {
 
         // setting
         case settings(setting: Setting)
-
+
+        // Notifications
+        case notificationPolicy(viewModel: NotificationFilterViewModel)
+        case notificationRequests(viewModel: NotificationRequestsViewModel)
+        case accountNotificationTimeline(viewModel: NotificationTimelineViewModel, request: Mastodon.Entity.NotificationRequest)
+
         // report
         case report(viewModel: ReportViewModel)
         case reportServerRules(viewModel: ReportServerRulesViewModel)
@@ -558,6 +563,12 @@ private extension SceneCoordinator {
         case .editStatus(let viewModel):
             let composeViewController = ComposeViewController(viewModel: viewModel)
             viewController = composeViewController
+        case .notificationRequests(let viewModel):
+            viewController = NotificationRequestsTableViewController(viewModel: viewModel)
+        case .notificationPolicy(let viewModel):
+            viewController = NotificationPolicyViewController(viewModel: viewModel)
+        case .accountNotificationTimeline(let viewModel, let request):
+            viewController = AccountNotificationTimelineViewController(viewModel: viewModel, context: appContext, coordinator: self, notificationRequest: request)
         }
 
         setupDependency(for: viewController as? NeedsDependency)

Mastodon/Protocol/Provider/DataSourceFacade+Notifications.swift

@@ -0,0 +1,52 @@
+// Copyright © 2024 Mastodon gGmbH. All rights reserved.
+
+import Foundation
+import MastodonCore
+import MastodonSDK
+
+extension DataSourceFacade {
+    @MainActor
+    static func coordinateToNotificationRequests(
+        provider: DataSourceProvider & AuthContextProvider
+    ) async {
+        provider.coordinator.showLoading()
+
+        do {
+            let notificationRequests = try await provider.context.apiService.notificationRequests(authenticationBox: provider.authContext.mastodonAuthenticationBox).value
+            let viewModel = NotificationRequestsViewModel(appContext: provider.context, authContext: provider.authContext, coordinator: provider.coordinator, requests: notificationRequests)
+
+            provider.coordinator.hideLoading()
+
+            let transition: SceneCoordinator.Transition
+
+            if provider.traitCollection.userInterfaceIdiom == .phone {
+                transition = .show
+            } else {
+                transition = .modal(animated: true)
+            }
+
+            provider.coordinator.present(scene: .notificationRequests(viewModel: viewModel), transition: transition)
+        } catch {
+            //TODO: Error Handling
+            provider.coordinator.hideLoading()
+        }
+    }
+
+    @MainActor
+    static func coordinateToNotificationRequest(
+        request: Mastodon.Entity.NotificationRequest,
+        provider: ViewControllerWithDependencies & AuthContextProvider
+    ) async -> AccountNotificationTimelineViewController? {
+        provider.coordinator.showLoading()
+
+        let notificationTimelineViewModel = NotificationTimelineViewModel(context: provider.context, authContext: provider.authContext, scope: .fromAccount(request.account))
+
+        provider.coordinator.hideLoading()
+
+        guard let viewController = provider.coordinator.present(scene: .accountNotificationTimeline(viewModel: notificationTimelineViewModel, request: request), transition: .show) as? AccountNotificationTimelineViewController else { return nil }
+
+        return viewController
+
+    }
+
+}

Mastodon/Protocol/Provider/DataSourceFacade+SearchHistory.swift

@@ -17,32 +17,30 @@ extension DataSourceFacade {
         item: DataSourceItem
     ) async {
         switch item {
-            case .account(account: let account, relationship: _):
-                let now = Date()
-                let userID = provider.authContext.mastodonAuthenticationBox.userID
-                let searchEntry = Persistence.SearchHistory.Item(
-                    updatedAt: now,
-                    userID: userID,
-                    account: account,
-                    hashtag: nil
-                )
+        case .account(account: let account, relationship: _):
+            let now = Date()
+            let userID = provider.authContext.mastodonAuthenticationBox.userID
+            let searchEntry = Persistence.SearchHistory.Item(
+                updatedAt: now,
+                userID: userID,
+                account: account,
+                hashtag: nil
+            )
 
-                try? FileManager.default.addSearchItem(searchEntry, for: provider.authContext.mastodonAuthenticationBox)
-            case .hashtag(let tag):
+            try? FileManager.default.addSearchItem(searchEntry, for: provider.authContext.mastodonAuthenticationBox)
+        case .hashtag(let tag):
 
-                let now = Date()
-                let userID = provider.authContext.mastodonAuthenticationBox.userID
-                let searchEntry = Persistence.SearchHistory.Item(
-                    updatedAt: now,
-                    userID: userID,
-                    account: nil,
-                    hashtag: tag
-                )
+            let now = Date()
+            let userID = provider.authContext.mastodonAuthenticationBox.userID
+            let searchEntry = Persistence.SearchHistory.Item(
+                updatedAt: now,
+                userID: userID,
+                account: nil,
+                hashtag: tag
+            )
 
-                try? FileManager.default.addSearchItem(searchEntry, for: provider.authContext.mastodonAuthenticationBox)
-            case .status:
-                break
-            case .notification:
+            try? FileManager.default.addSearchItem(searchEntry, for: provider.authContext.mastodonAuthenticationBox)
+        case .status, .notification, .notificationBanner(_):
                 break
 
         }

Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift

@@ -514,10 +514,9 @@ extension NotificationTableViewCellDelegate where Self: DataSourceProvider & Aut
                 )
             case .account(let account, _):
                 await DataSourceFacade.coordinateToProfileScene(provider: self, account: account)
-            case .notification:
-                assertionFailure("TODO")
-            case .hashtag(_):
-                assertionFailure("TODO")
+            case .notification, .hashtag(_), .notificationBanner(_):
+                // not supposed to happen
+                break
             }
         }   // end Task
     }

Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift

@@ -618,10 +618,9 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte
                     provider: self,
                     account: account
                 )
-            case .notification:
-                assertionFailure("TODO")
-            case .hashtag(_):
-                assertionFailure("TODO")
+            case .notification, .hashtag(_), .notificationBanner(_):
+                // not supposed to happen
+                break
             }
         }
     }

Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift

@@ -22,42 +22,44 @@ extension UITableViewDelegate where Self: DataSourceProvider & AuthContextProvid
                 return
             }
             switch item {
-                case .account(let account, relationship: _):
-                    await DataSourceFacade.coordinateToProfileScene(provider: self, account: account)
-                case .status(let status):
+            case .account(let account, relationship: _):
+                await DataSourceFacade.coordinateToProfileScene(provider: self, account: account)
+            case .status(let status):
+                await DataSourceFacade.coordinateToStatusThreadScene(
+                    provider: self,
+                    target: .status,    // remove reblog wrapper
+                    status: status
+                )
+            case .hashtag(let tag):
+                await DataSourceFacade.coordinateToHashtagScene(
+                    provider: self,
+                    tag: tag
+                )
+            case .notification(let notification):
+                let _status: MastodonStatus? = notification.status
+                if let status = _status {
                     await DataSourceFacade.coordinateToStatusThreadScene(
                         provider: self,
                         target: .status,    // remove reblog wrapper
                         status: status
                     )
-                case .hashtag(let tag):
-                    await DataSourceFacade.coordinateToHashtagScene(
-                        provider: self,
-                        tag: tag
+                } else if let accountWarning = notification.entity.accountWarning {
+                    let url = Mastodon.API.disputesEndpoint(domain: authContext.mastodonAuthenticationBox.domain, strikeId: accountWarning.id)
+                    _ = coordinator.present(
+                        scene: .safari(url: url),
+                        from: self,
+                        transition: .safariPresent(animated: true, completion: nil)
                     )
-                case .notification(let notification):
-                    let _status: MastodonStatus? = notification.status
-                    if let status = _status {
-                        await DataSourceFacade.coordinateToStatusThreadScene(
-                            provider: self,
-                            target: .status,    // remove reblog wrapper
-                            status: status
-                        )
-                    } else if let accountWarning = notification.entity.accountWarning {
-                        let url = Mastodon.API.disputesEndpoint(domain: authContext.mastodonAuthenticationBox.domain, strikeId: accountWarning.id)
-                        _ = coordinator.present(
-                            scene: .safari(url: url),
-                            from: self,
-                            transition: .safariPresent(animated: true, completion: nil)
-                        )
 
-                    } else {
-                        await DataSourceFacade.coordinateToProfileScene(
-                            provider: self,
-                            account: notification.entity.account
-                        )
-                    }   // end Task
-            }   // end func
+                } else {
+                    await DataSourceFacade.coordinateToProfileScene(
+                        provider: self,
+                        account: notification.entity.account
+                    )
+                }
+            case .notificationBanner(let policy):
+                await DataSourceFacade.coordinateToNotificationRequests(provider: self)
+            }
         }
     }
 }

Mastodon/Protocol/Provider/DataSourceProvider.swift

@@ -14,6 +14,7 @@ enum DataSourceItem: Hashable {
     case status(record: MastodonStatus)
     case hashtag(tag: Mastodon.Entity.Tag)
     case notification(record: MastodonNotification)
+    case notificationBanner(policy: Mastodon.Entity.NotificationPolicy)
     case account(account: Mastodon.Entity.Account, relationship: Mastodon.Entity.Relationship?)
 }