Some edit reverted notification cleanup

WMF Framework/Remote Notifications/Model/RemoteNotificationsModelController.swift

@@ -42,7 +42,6 @@ import CocoaLumberjackSwift
 }
 
 final class RemoteNotificationsModelController: NSObject {
-    public static let modelDidChangeNotification = NSNotification.Name(rawValue: "RemoteNotificationsModelDidChange")
     public static let didLoadPersistentStoresNotification = NSNotification.Name(rawValue: "ModelControllerDidLoadPersistentStores")
 
     let managedObjectContext: NSManagedObjectContext
@@ -90,7 +89,6 @@ final class RemoteNotificationsModelController: NSObject {
         managedObjectContext = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         managedObjectContext.persistentStoreCoordinator = container.persistentStoreCoordinator
         super.init()
-        NotificationCenter.default.addObserver(self, selector: #selector(managedObjectContextDidSave(_:)), name: NSNotification.Name.NSManagedObjectContextDidSave, object: managedObjectContext)
     }
 
     deinit {
@@ -136,26 +134,6 @@ final class RemoteNotificationsModelController: NSObject {
         }
     }
 
-    // MARK: Validation
-
-    let validNotificationCategories: Set<RemoteNotificationCategory> = [.editReverted]
-
-    private func validateCategory(of notification: RemoteNotificationsAPIController.NotificationsResult.Notification) -> Bool {
-        guard let categoryString = notification.category else {
-            assertionFailure("Missing notification category")
-            return false
-        }
-        let category = RemoteNotificationCategory(stringValue: categoryString)
-        return validNotificationCategories.contains(category)
-    }
-
-    private func validateAge(ofNotificationDated date: Date) -> Bool {
-        let sinceNow = Int(date.timeIntervalSinceNow)
-        let hoursPassed = abs(sinceNow / 3600)
-        let maxHoursPassed = 24
-        return hoursPassed <= maxHoursPassed
-    }
-
     public func createNewNotifications(from notificationsFetchedFromTheServer: Set<RemoteNotificationsAPIController.NotificationsResult.Notification>, completion: @escaping () -> Void) throws {
         managedObjectContext.perform {
             for notification in notificationsFetchedFromTheServer {
@@ -178,12 +156,6 @@ final class RemoteNotificationsModelController: NSObject {
             assertionFailure("Notification must have an id")
             return
         }
-        guard self.validateCategory(of: notification) else {
-            return
-        }
-        guard self.validateAge(ofNotificationDated: date) else {
-            return
-        }
         let message = notification.message?.header?.wmf_stringByRemovingHTML()
         let _ = managedObjectContext.wmf_create(entityNamed: "RemoteNotification",
                                                 withKeysAndValues: ["id": id,
@@ -285,37 +257,4 @@ final class RemoteNotificationsModelController: NSObject {
             self.save()
         }
     }
-
-    // MARK: Notifications
-
-    @objc private func managedObjectContextDidSave(_ note: Notification) {
-        guard let userInfo = note.userInfo else {
-            assertionFailure("Expected note with userInfo dictionary")
-            return
-        }
-        if let insertedObjects = userInfo[NSInsertedObjectsKey] as? Set<NSManagedObject>, !insertedObjects.isEmpty {
-            postModelDidChangeNotification(ofType: .addedNewNotifications, withNotificationsFromObjects: insertedObjects)
-        }
-        if let updatedObjects = userInfo[NSUpdatedObjectsKey] as? Set<NSManagedObject>, !updatedObjects.isEmpty {
-            postModelDidChangeNotification(ofType: .updatedExistingNotifications, withNotificationsFromObjects: updatedObjects)
-        }
-    }
-
-    private func postModelDidChangeNotification(ofType modelChangeType: RemoteNotificationsModelChangeType, withNotificationsFromObjects objects: Set<NSManagedObject>) {
-        let notifications = objects.compactMap { $0 as? RemoteNotification }.filter { $0.state == nil }
-        guard !notifications.isEmpty else {
-            return
-        }
-        let notificationsGroupedByCategoryNumber = Dictionary(grouping: notifications, by: { NSNumber(value: $0.category.rawValue) })
-        let modelChange = RemoteNotificationsModelChange(type: modelChangeType, notificationsGroupedByCategoryNumber: notificationsGroupedByCategoryNumber)
-        let responseCoordinator = RemoteNotificationsModelChangeResponseCoordinator(modelChange: modelChange, modelController: self)
-        DispatchQueue.main.async {
-            NotificationCenter.default.post(name: RemoteNotificationsModelController.modelDidChangeNotification, object: responseCoordinator)
-        }
-    }
-}
-
-
-@objc public class RemoteNotificationsModelControllerNotification: NSObject {
-    @objc public static let modelDidChange = RemoteNotificationsModelController.modelDidChangeNotification
 }

Wikipedia/Code/WMFAppViewController.m

@@ -206,11 +206,6 @@ - (void)viewDidLoad {
                                                  name:WMFExploreFeedPreferencesDidChangeNotification
                                                object:nil];
 
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(remoteNotificationsModelDidChange:)
-                                                 name:[RemoteNotificationsModelControllerNotification modelDidChange]
-                                               object:nil];
-
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(userWasLoggedOut:)
                                                  name:[WMFAuthenticationManager didLogOutNotification]
@@ -1624,12 +1619,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
 // The method will be called on the delegate only if the application is in the foreground. If the method is not implemented or the handler is not called in a timely manner then the notification will not be presented. The application can choose to have the notification presented as a sound, badge, alert and/or in the notification list. This decision should be based on whether the information in the notification is otherwise visible to the user.
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler {
     completionHandler(UNNotificationPresentationOptionAlert);
-    UNNotificationContent *notificationContent = notification.request.content;
-    NSString *categoryIdentifier = notificationContent.categoryIdentifier;
-    NSString *notificationID = (NSString *)notificationContent.userInfo[WMFEditRevertedNotificationIDKey];
-    if ([categoryIdentifier isEqualToString:WMFEditRevertedNotificationCategoryIdentifier]) {
-        [self.remoteNotificationsModelChangeResponseCoordinator markAsSeenNotificationWithID:notificationID];
-    }
 }
 
 // The method will be called on the delegate when the user responded to the notification by opening the application, dismissing the notification or choosing a UNNotificationAction. The delegate must be set before the application returns from applicationDidFinishLaunching:.
@@ -1648,23 +1637,6 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNoti
             [self showInTheNewsForNotificationInfo:info];
         } else if ([actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier]) {
         }
-        // WMFEditRevertedNotification
-    } else if ([categoryIdentifier isEqualToString:WMFEditRevertedNotificationCategoryIdentifier]) {
-        NSDictionary *info = response.notification.request.content.userInfo;
-        NSString *articleURLString = (NSString *)info[WMFNotificationInfoArticleURLStringKey];
-        NSString *notificationID = (NSString *)info[WMFEditRevertedNotificationIDKey];
-        assert(articleURLString);
-        assert(notificationID);
-        if ([actionIdentifier isEqualToString:WMFEditRevertedReadMoreActionIdentifier] || [actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier]) {
-            NSURL *articleURL = [NSURL URLWithString:articleURLString];
-            assert(articleURL);
-            [self showReadMoreAboutRevertedEditViewControllerWithArticleURL:articleURL
-                                                                 completion:^{
-                                                                     [self.remoteNotificationsModelChangeResponseCoordinator markAsReadNotificationWithID:notificationID];
-                                                                 }];
-        } else {
-            [self.remoteNotificationsModelChangeResponseCoordinator markAsReadNotificationWithID:notificationID];
-        }
     }
 
     completionHandler();
@@ -2025,49 +1997,6 @@ - (void)setRemoteNotificationRegistrationStatusWithDeviceToken: (nullable NSData
     [self.notificationsController setRemoteNotificationRegistrationStatusWithDeviceToken:deviceToken error:error];
 }
 
-- (void)remoteNotificationsModelDidChange:(NSNotification *)note {
-    self.remoteNotificationsModelChangeResponseCoordinator = (RemoteNotificationsModelChangeResponseCoordinator *)note.object;
-    assert(self.remoteNotificationsModelChangeResponseCoordinator);
-    RemoteNotificationsModelChange *modelChange = (RemoteNotificationsModelChange *)self.remoteNotificationsModelChangeResponseCoordinator.modelChange;
-    NSDictionary<NSNumber *, NSArray<RemoteNotification *> *> *notificationsGroupedByCategoryNumber = (NSDictionary<NSNumber *, NSArray<RemoteNotification *> *> *)modelChange.notificationsGroupedByCategoryNumber;
-    assert(modelChange);
-    switch (modelChange.type) {
-        case RemoteNotificationsModelChangeTypeAddedNewNotifications:
-        case RemoteNotificationsModelChangeTypeUpdatedExistingNotifications:
-            [self scheduleLocalNotificationsForRemoteNotificationsWithCategory:RemoteNotificationCategoryEditReverted notificationsGroupedByCategoryNumber:notificationsGroupedByCategoryNumber];
-        default:
-            break;
-    }
-}
-
-- (void)scheduleLocalNotificationsForRemoteNotificationsWithCategory:(RemoteNotificationCategory)category notificationsGroupedByCategoryNumber:(NSDictionary<NSNumber *, NSArray<RemoteNotification *> *> *)notificationsGroupedByCategoryNumber {
-    NSAssert(category == RemoteNotificationCategoryEditReverted, @"Categories other than RemoteNotificationCategoryEditReverted are not supported");
-
-    NSNumber *editRevertedCategoryNumber = [NSNumber numberWithInt:RemoteNotificationCategoryEditReverted];
-    NSArray<RemoteNotification *> *editRevertedNotifications = notificationsGroupedByCategoryNumber[editRevertedCategoryNumber];
-    if (editRevertedNotifications.count == 0) {
-        return;
-    }
-
-    for (RemoteNotification *editRevertedNotification in editRevertedNotifications) {
-        WMFArticle *article = [self.dataStore fetchArticleWithWikidataID:editRevertedNotification.affectedPageID];
-        if (!article || !article.displayTitle || !article.URL || !editRevertedNotification.agent) {
-            // Exclude notifications without article context or notification agent
-            [self.remoteNotificationsModelChangeResponseCoordinator markAsExcluded:editRevertedNotification];
-        } else {
-            NSString *articleTitle = article.displayTitle;
-            NSString *agent = editRevertedNotification.agent;
-
-            NSString *notificationTitle = [WMFCommonStrings revertedEditTitle];
-            NSString *notificationBodyFormat = WMFLocalizedStringWithDefaultValue(@"reverted-edit-notification-body", nil, nil, @"The edit you made of the article %1$@ was reverted by %2$@", @"Title for notification telling user that the edit they made was reverted. %1$@ is replaced with the title of the affected article, %2$@ is replaced with the username of the person who reverted the edit.");
-            NSString *notificationBody = [NSString localizedStringWithFormat:notificationBodyFormat, articleTitle, agent];
-
-            NSDictionary *userInfo = @{WMFNotificationInfoArticleURLStringKey: article.URL.absoluteString, WMFEditRevertedNotificationIDKey: editRevertedNotification.id};
-            [self.notificationsController sendNotificationWithTitle:notificationTitle body:notificationBody categoryIdentifier:WMFEditRevertedNotificationCategoryIdentifier userInfo:userInfo atDateComponents:nil];
-        }
-    }
-}
-
 - (void)showReadMoreAboutRevertedEditViewControllerWithArticleURL:(NSURL *)articleURL completion:(void (^)(void))completion {
     ReadMoreAboutRevertedEditViewController *readMoreViewController = [[ReadMoreAboutRevertedEditViewController alloc] initWithNibName:@"ReadMoreAboutRevertedEditViewController" bundle:nil];
     readMoreViewController.delegate = self;

Wikipedia/Code/WMFNotificationsController.h

@@ -8,10 +8,6 @@ extern NSString *const WMFInTheNewsNotificationReadNowActionIdentifier;
 extern NSString *const WMFInTheNewsNotificationSaveForLaterActionIdentifier;
 extern NSString *const WMFInTheNewsNotificationShareActionIdentifier;
 
-extern NSString *const WMFEditRevertedNotificationCategoryIdentifier;
-extern NSString *const WMFEditRevertedReadMoreActionIdentifier;
-extern NSString *const WMFEditRevertedNotificationIDKey;
-
 extern NSString *const WMFNotificationInfoArticleTitleKey;
 extern NSString *const WMFNotificationInfoArticleURLStringKey;
 extern NSString *const WMFNotificationInfoThumbnailURLStringKey;

Wikipedia/Code/WMFNotificationsController.m

@@ -9,10 +9,6 @@
 NSString *const WMFInTheNewsNotificationSaveForLaterActionIdentifier = @"inTheNewsNotificationSaveForLaterActionIdentifier";
 NSString *const WMFInTheNewsNotificationShareActionIdentifier = @"inTheNewsNotificationShareActionIdentifier";
 
-NSString *const WMFEditRevertedNotificationCategoryIdentifier = @"WMFEditRevertedNotificationCategoryIdentifier";
-NSString *const WMFEditRevertedReadMoreActionIdentifier = @"WMFEditRevertedReadMoreActionIdentifier";
-NSString *const WMFEditRevertedNotificationIDKey = @"WMFEditRevertedNotificationIDKey";
-
 NSString *const WMFNotificationInfoArticleTitleKey = @"articleTitle";
 NSString *const WMFNotificationInfoArticleURLStringKey = @"articleURLString";
 NSString *const WMFNotificationInfoThumbnailURLStringKey = @"thumbnailURLString";
@@ -93,9 +89,8 @@ - (void)updateCategories {
     UNNotificationAction *readNowAction = [UNNotificationAction actionWithIdentifier:WMFInTheNewsNotificationReadNowActionIdentifier title:WMFLocalizedStringWithDefaultValue(@"in-the-news-notification-read-now-action-title", nil, nil, @"Read Now", @"Title on the 'Read Now' action button") options:UNNotificationActionOptionForeground];
     UNNotificationAction *shareAction = [UNNotificationAction actionWithIdentifier:WMFInTheNewsNotificationShareActionIdentifier title:WMFLocalizedStringWithDefaultValue(@"in-the-news-notification-share-action-title", nil, nil, @"Share…", @"Title on the 'Share' action button {{Identical|Share}}") options:UNNotificationActionOptionForeground];
     UNNotificationAction *saveForLaterAction = [UNNotificationAction actionWithIdentifier:WMFInTheNewsNotificationSaveForLaterActionIdentifier title:WMFLocalizedStringWithDefaultValue(@"in-the-news-notification-save-for-later-action-title", nil, nil, @"Save for later", @"Title on the 'Save for later' action button") options:UNNotificationActionOptionNone];
-    UNNotificationAction *readMoreAction = [UNNotificationAction actionWithIdentifier:WMFEditRevertedReadMoreActionIdentifier title:WMFLocalizedStringWithDefaultValue(@"reverted-edit-notification-read-more-action-title", nil, nil, @"Read more", @"Title on the 'Read more' action button") options:UNNotificationActionOptionNone];
 
-    if (!readNowAction || !saveForLaterAction || !shareAction || !readMoreAction) {
+    if (!readNowAction || !saveForLaterAction || !shareAction) {
         DDLogError(@"Unable to create notification categories");
         return;
     }
@@ -107,9 +102,7 @@ - (void)updateCategories {
         return;
     }
 
-    UNNotificationCategory *editRevertedCategory = [UNNotificationCategory categoryWithIdentifier:WMFEditRevertedNotificationCategoryIdentifier actions:@[readMoreAction] intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
-
-    [center setNotificationCategories:[NSSet setWithObjects:inTheNewsCategory, editRevertedCategory, nil]];
+    [center setNotificationCategories:[NSSet setWithObjects:inTheNewsCategory, nil]];
 }
 
 - (void)requestPermissionsWithCompletionHandler:(void (^)(BOOL, NSError *_Nullable))completionHandler {

Wikipedia/Localizations/en.lproj/Localizable.strings

@@ -734,8 +734,6 @@
 "replace-textfield-accessibility" = "Replace";
 "replace-textfield-placeholder" = "Replace with…";
 "reverted-edit-back-to-article-button-title" = "Back to article";
-"reverted-edit-notification-body" = "The edit you made of the article $1 was reverted by $2";
-"reverted-edit-notification-read-more-action-title" = "Read more";
 "reverted-edit-possible-reasons" = "- Your contribution didn’t follow one of the guidelines. $1 \n\n - Your contribution looked like an experiment or vandalism";
 "reverted-edit-possible-reasons-subtitle" = "We know that you tried your best, but one of the reviewers had a concern.\n\nPossible reasons your edit was reverted include:";
 "reverted-edit-thanks-for-editing-title" = "Thanks for editing Wikipedia!";

Wikipedia/Localizations/qqq.lproj/Localizable.strings

@@ -734,8 +734,6 @@
 "replace-textfield-accessibility" = "Accessibility label for the replace text field.";
 "replace-textfield-placeholder" = "Placeholder text seen in replace textfield before textfield is focused.";
 "reverted-edit-back-to-article-button-title" = "Title for button that allows the user to go back to the article they edited";
-"reverted-edit-notification-body" = "Title for notification telling user that the edit they made was reverted. $1 is replaced with the title of the affected article, $2 is replaced with the username of the person who reverted the edit.";
-"reverted-edit-notification-read-more-action-title" = "Title on the 'Read more' action button";
 "reverted-edit-possible-reasons" = "List of possible reasons describing why an edit might have been reverted. $1 is replaced with a link to view editing guidelines";
 "reverted-edit-possible-reasons-subtitle" = "Subtitle leading to an explanation why an edit was reverted.";
 "reverted-edit-thanks-for-editing-title" = "Title thanking the user for contributing to Wikipedia";