Don't show non-approved cached comments.

Author: ScoutHarris

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.h

@@ -34,4 +34,6 @@ typedef NS_ENUM(NSUInteger, ReaderCommentsSource) {
 
 // Comment moderation support.
 @property (nonatomic, assign, readwrite) BOOL commentModified;
+- (void)refreshAfterCommentModeration;
+
 @end

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m

@@ -939,6 +939,12 @@ - (void)refreshNoResultsView
     [self.noResultsViewController didMoveToParentViewController:self];
 }
 
+- (void)refreshAfterCommentModeration
+{
+    [self.tableViewHandler refreshTableView];
+    [self refreshNoResultsView];
+}
+
 - (void)updateTableViewForAttachments
 {
     [self.tableView performBatchUpdates:nil completion:nil];
@@ -1205,9 +1211,11 @@ - (NSFetchRequest *)fetchRequest
         return nil;
     }
 
-    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:NSStringFromClass([Comment class])];
-    fetchRequest.predicate = [NSPredicate predicateWithFormat:@"post = %@", self.post];
+    // Moderated comments could still be cached, so filter out non-approved comments.
+    NSString *approvedStatus = [Comment descriptionFor:CommentStatusTypeApproved];
 
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:NSStringFromClass([Comment class])];
+    fetchRequest.predicate = [NSPredicate predicateWithFormat:@"post = %@ AND status = %@", self.post, approvedStatus];
     NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"hierarchy" ascending:YES];
     [fetchRequest setSortDescriptors:@[sortDescriptor]];
 
@@ -1231,12 +1239,6 @@ - (void)configureCell:(UITableViewCell *)aCell atIndexPath:(NSIndexPath *)indexP
     }
 
     Comment *comment = [self.tableViewHandler.resultsController objectAtIndexPath:indexPath];
-    // The user may have moderated a comment, but it is not removed from the post yet.
-    // So check the status to be sure only Approved comments are displayed.
-    if (![comment.status isEqualToString:[Comment descriptionFor:CommentStatusTypeApproved]]) {
-        return;
-    }
-    
     if ([self newCommentThreadEnabled]) {
         CommentContentTableViewCell *cell = (CommentContentTableViewCell *)aCell;
         [self configureContentCell:cell comment:comment indexPath:indexPath handler:self.tableViewHandler];
@@ -1296,8 +1298,6 @@ - (void)configureCell:(UITableViewCell *)aCell atIndexPath:(NSIndexPath *)indexP
         };
     }
 
-
-
     NSAttributedString *attrStr = [self cacheContentForComment:comment];
     [cell configureCellWithComment:comment attributedString:attrStr];
 }

WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.swift

@@ -246,15 +246,10 @@ private extension ReaderCommentsViewController {
     func moderateComment(_ comment: Comment, status: CommentStatusType, handler: WPTableViewHandler) {
         let successBlock: (String) -> Void = { [weak self] noticeText in
             self?.commentModified = true
+            self?.refreshAfterCommentModeration()
 
-            // Adjust the ReaderPost's comment count.
-            if let post = self?.post, let commentCount = post.commentCount?.intValue {
-                let adjustment = (status == .approved) ? 1 : -1
-                post.commentCount = NSNumber(value: commentCount + adjustment)
-            }
-
-            // Refresh the UI. The table view handler is needed because the fetched results delegate is set to nil.
-            handler.refreshTableViewPreservingOffset()
+            // Dismiss any old notices to avoid stacked Undo notices.
+            self?.dismissNotice()
 
             // If the status is Approved, the user has undone a comment moderation.
             // So don't show the Undo option in this case.

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift

@@ -382,12 +382,15 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
             return
         }
 
+        // Moderated comments could still be cached, so filter out non-approved comments.
+        let approvedComments = comments.filter({ $0.status == "approve"})
+
         // Set the delegate here so the table isn't shown until fetching is complete.
         commentsTableView.delegate = commentsTableViewDelegate
         commentsTableView.dataSource = commentsTableViewDelegate
 
         commentsTableViewDelegate.updateWith(post: post,
-                                             comments: comments,
+                                             comments: approvedComments,
                                              totalComments: totalComments,
                                              presentingViewController: self,
                                              buttonDelegate: self)