Disambiguate Notification usages — / Notification\?/

Author: mokagio

WordPress/Classes/ViewRelated/Comments/Controllers/CommentDetailViewController.swift

@@ -47,7 +47,7 @@ class CommentDetailViewController: UIViewController, NoResultsViewHost {
             }
         }
     }
-    private var notification: Notification?
+    private var notification: WordPressData.Notification?
     private let helper = ReaderCommentsHelper()
 
     private var isNotificationComment: Bool {

WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentCellViewModel.swift

@@ -5,14 +5,14 @@ import WordPressShared
 final class CommentCellViewModel: NSObject {
     @objc let comment: Comment
 
-    private let notification: Notification?
+    private let notification: WordPressData.Notification?
     private let coreDataStack = ContextManager.shared
 
     @Published private(set) var content: String?
     @Published private(set) var avatar: Avatar?
     @Published private(set) var state: State
 
-    init(comment: Comment, notification: Notification? = nil) {
+    init(comment: Comment, notification: WordPressData.Notification? = nil) {
         self.comment = comment
         self.notification = notification
 

WordPress/Classes/ViewRelated/Likes/LikesListController.swift

@@ -27,7 +27,7 @@ class LikesListController: NSObject {
     private let formatter = FormattableContentFormatter()
     private let content: ContentIdentifier
     private let siteID: NSNumber
-    private var notification: Notification? = nil
+    private var notification: WordPressData.Notification? = nil
     private var readerPost: ReaderPost? = nil
     private let tableView: UITableView
     private var loadingIndicator = UIActivityIndicatorView()

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.swift

@@ -9,8 +9,8 @@ import FormattableContentKit
 ///
 ///
 protocol NotificationsNavigationDataSource: AnyObject {
-    func notification(succeeding note: WordPressData.Notification) -> Notification?
-    func notification(preceding note: WordPressData.Notification) -> Notification?
+    func notification(succeeding note: WordPressData.Notification) -> WordPressData.Notification?
+    func notification(preceding note: WordPressData.Notification) -> WordPressData.Notification?
 }
 
 // MARK: - Renders a given Notification entity, onscreen

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController/NotificationsViewController.swift

@@ -79,7 +79,7 @@ class NotificationsViewController: UIViewController, UITableViewDataSource, UITa
     /// Used to keep track of the currently selected notification,
     /// to restore it between table view reloads and state restoration.
     ///
-    fileprivate var selectedNotification: Notification? = nil
+    fileprivate var selectedNotification: WordPressData.Notification? = nil
 
     /// JetpackLoginVC being presented.
     ///
@@ -1002,7 +1002,7 @@ private extension NotificationsViewController {
         syncDeletedNotification(notification)
     }
 
-    func syncDeletedNotification(_ notification: Notification?) {
+    func syncDeletedNotification(_ notification: WordPressData.Notification?) {
         guard let notification else {
             return
         }
@@ -1680,13 +1680,13 @@ private extension NotificationsViewController {
         viewModel.lastSeenChanged(timestamp: note.timestamp)
     }
 
-    func loadNotification(with noteId: String) -> Notification? {
+    func loadNotification(with noteId: String) -> WordPressData.Notification? {
         let predicate = NSPredicate(format: "(notificationId == %@)", noteId)
 
         return mainContext.firstObject(ofType: Notification.self, matching: predicate)
     }
 
-    func loadNotification(near note: Notification, withIndexDelta delta: Int) -> Notification? {
+    func loadNotification(near note: Notification, withIndexDelta delta: Int) -> WordPressData.Notification? {
         guard let notifications = tableViewHandler?.resultsController?.fetchedObjects as? [Notification] else {
             return nil
         }
@@ -1718,11 +1718,11 @@ private extension NotificationsViewController {
 // MARK: - Details Navigation Datasource
 //
 extension NotificationsViewController: NotificationsNavigationDataSource {
-    @objc func notification(succeeding note: WordPressData.Notification) -> Notification? {
+    @objc func notification(succeeding note: WordPressData.Notification) -> WordPressData.Notification? {
         return loadNotification(near: note, withIndexDelta: -1)
     }
 
-    @objc func notification(preceding note: WordPressData.Notification) -> Notification? {
+    @objc func notification(preceding note: WordPressData.Notification) -> WordPressData.Notification? {
         return loadNotification(near: note, withIndexDelta: +1)
     }
 }

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController/NotificationsViewModel.swift

@@ -85,7 +85,7 @@ final class NotificationsViewModel {
         near note: Notification,
         allNotifications: [Notification],
         withIndexDelta delta: Int
-    ) -> Notification? {
+    ) -> WordPressData.Notification? {
         guard let noteIndex = allNotifications.firstIndex(of: note) else {
             return nil
         }

WordPress/Classes/ViewRelated/Notifications/Tools/NotificationCommentDetailCoordinator.swift

@@ -4,9 +4,9 @@ import WordPressShared
 // This facilitates showing the CommentDetailViewController within the context of Notifications.
 
 protocol CommentDetailsNotificationDelegate: AnyObject {
-    func previousNotificationTapped(current: Notification?)
-    func nextNotificationTapped(current: Notification?)
-    func commentWasModerated(for notification: Notification?)
+    func previousNotificationTapped(current: WordPressData.Notification?)
+    func nextNotificationTapped(current: WordPressData.Notification?)
+    func commentWasModerated(for notification: WordPressData.Notification?)
 }
 
 class NotificationCommentDetailCoordinator: NSObject {
@@ -16,7 +16,7 @@ class NotificationCommentDetailCoordinator: NSObject {
     private var viewController: NotificationCommentDetailViewController?
     private let managedObjectContext = ContextManager.shared.mainContext
 
-    private var notification: Notification? {
+    private var notification: WordPressData.Notification? {
         didSet {
             markNotificationReadIfNeeded()
         }
@@ -137,7 +137,7 @@ private extension NotificationCommentDetailCoordinator {
 
 extension NotificationCommentDetailCoordinator: CommentDetailsNotificationDelegate {
 
-    func previousNotificationTapped(current: Notification?) {
+    func previousNotificationTapped(current: WordPressData.Notification?) {
         guard let current,
               let previousNotification = notificationsNavigationDataSource?.notification(preceding: current) else {
                   return
@@ -147,7 +147,7 @@ extension NotificationCommentDetailCoordinator: CommentDetailsNotificationDelega
         updateViewWith(notification: previousNotification)
     }
 
-    func nextNotificationTapped(current: Notification?) {
+    func nextNotificationTapped(current: WordPressData.Notification?) {
         guard let current,
               let nextNotification = notificationsNavigationDataSource?.notification(succeeding: current) else {
                   return
@@ -157,7 +157,7 @@ extension NotificationCommentDetailCoordinator: CommentDetailsNotificationDelega
         updateViewWith(notification: nextNotification)
     }
 
-    func commentWasModerated(for notification: Notification?) {
+    func commentWasModerated(for notification: WordPressData.Notification?) {
         guard let notification,
               !notificationsCommentModerated.contains(notification) else {
                   return