[MBL-1026] Filter comments from blocked users (#1883)

* Add blocked field to User object

* Replace info in comments that shouldn't show

* Delete separate RootCommentCellViewModel

* Cleanup and adding test

* Fix UserTests

* Only show blocking options if user isn't blocked

Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewController.swift

@@ -187,6 +187,7 @@ final class CommentRepliesViewController: UITableViewController, MessageBannerVi
 
   private func handleCommentCellHeaderTapped(in cell: UITableViewCell, _ author: Comment.Author) {
     guard AppEnvironment.current.currentUser != nil, featureBlockUsersEnabled() else { return }
+    guard author.isBlocked == false else { return }
 
     let actionSheet = UIAlertController
       .blockUserActionSheet(

Kickstarter-iOS/Features/Comments/Controllers/CommentsViewController.swift

@@ -263,6 +263,7 @@ extension CommentsViewController {
 extension CommentsViewController: CommentCellDelegate {
   func commentCellDidTapHeader(_ cell: CommentCell, _ author: Comment.Author) {
     guard AppEnvironment.current.currentUser != nil, featureBlockUsersEnabled() else { return }
+    guard author.isBlocked == false else { return }
 
     let actionSheet = UIAlertController
       .blockUserActionSheet(

Kickstarter-iOS/Features/Comments/Views/Cells/RootCommentCell.swift

@@ -34,7 +34,7 @@ final class RootCommentCell: UITableViewCell, ValueCell {
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
-  private let viewModel = RootCommentCellViewModel()
+  private let viewModel = CommentCellViewModel()
 
   // MARK: - Lifecycle
 
@@ -76,7 +76,7 @@ final class RootCommentCell: UITableViewCell, ValueCell {
   internal func configureWith(value: Comment) {
     self.commentCellHeaderStackView
       .configureWith(comment: value)
-    self.viewModel.inputs.configureWith(comment: value)
+    self.viewModel.inputs.configureWith(comment: value, project: nil)
   }
 
   private func configureViews() {
@@ -124,7 +124,7 @@ final class RootCommentCell: UITableViewCell, ValueCell {
   internal override func bindViewModel() {
     self.bodyTextView.rac.text = self.viewModel.outputs.body
 
-    self.viewModel.outputs.commentAuthor
+    self.viewModel.outputs.cellAuthor
       .observeForUI()
       .observeValues { [weak self] author in
         guard let self = self else { return }
@@ -135,6 +135,6 @@ final class RootCommentCell: UITableViewCell, ValueCell {
   // MARK: - Actions
 
   @objc private func commentCellHeaderTapped() {
-    self.viewModel.inputs.commentCellHeaderTapped()
+    self.viewModel.inputs.cellHeaderTapped()
   }
 }

Kickstarter-iOS/Features/Comments/Views/CommentCellHeaderStackView.swift

@@ -132,8 +132,10 @@ internal final class CommentCellHeaderStackView: UIStackView {
         self?.circleAvatarImageView.image = nil
       })
       .observeValues { [weak self] url in
-        self?.circleAvatarImageView
-          .ksr_setImageWithURL(url)
+        if let url {
+          self?.circleAvatarImageView
+            .ksr_setImageWithURL(url)
+        }
       }
 
     self.viewModel.outputs.authorBadge

Kickstarter.xcodeproj/project.pbxproj

@@ -181,9 +181,7 @@
 		06DAAE5A26AA3CD500194E58 /* CategoryFragment.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 8A1556EE269398CA00017845 /* CategoryFragment.graphql */; };
 		06DAAE5B26AA3CD800194E58 /* BackingFragment.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 8A1556D7269394A400017845 /* BackingFragment.graphql */; };
 		06DAAE5D26AA3CF500194E58 /* UserStoredCardsFragment.graphql in Resources */ = {isa = PBXBuildFile; fileRef = 06DAAE5C26AA3CF500194E58 /* UserStoredCardsFragment.graphql */; };
-		06DC4138266FEE89005205F7 /* RootCommentCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DC4137266FEE89005205F7 /* RootCommentCellViewModel.swift */; };
 		06DC4144266FF184005205F7 /* RootCommentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DC413C266FF179005205F7 /* RootCommentCell.swift */; };
-		06DC4152266FFE81005205F7 /* RootCommentCellViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06DC4151266FFE81005205F7 /* RootCommentCellViewModelTests.swift */; };
 		06E3296B270E39B300216306 /* ProjectPageNavigationBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E3296A270E39B300216306 /* ProjectPageNavigationBarView.swift */; };
 		06EA2D4C280F76B700F4DE2E /* Prelude in Frameworks */ = {isa = PBXBuildFile; productRef = 06EA2D4B280F76B700F4DE2E /* Prelude */; };
 		06EB4E3127B5D32000D8BFCC /* PinchToZoom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EB4E2F27B5D26800D8BFCC /* PinchToZoom.swift */; };
@@ -1725,9 +1723,7 @@
 		06D23BBE26F2484500F76122 /* Project+FetchProjectFriendsQueryDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Project+FetchProjectFriendsQueryDataTests.swift"; sourceTree = "<group>"; };
 		06D23BC026F2498100F76122 /* FetchProjectFriendsQueryTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchProjectFriendsQueryTemplate.swift; sourceTree = "<group>"; };
 		06DAAE5C26AA3CF500194E58 /* UserStoredCardsFragment.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = UserStoredCardsFragment.graphql; sourceTree = "<group>"; };
-		06DC4137266FEE89005205F7 /* RootCommentCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootCommentCellViewModel.swift; sourceTree = "<group>"; };
 		06DC413C266FF179005205F7 /* RootCommentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootCommentCell.swift; sourceTree = "<group>"; };
-		06DC4151266FFE81005205F7 /* RootCommentCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootCommentCellViewModelTests.swift; sourceTree = "<group>"; };
 		06E3296A270E39B300216306 /* ProjectPageNavigationBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectPageNavigationBarView.swift; sourceTree = "<group>"; };
 		06EA2D36280F1F1900F4DE2E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		06EB4E2D27B5D06A00D8BFCC /* OverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayView.swift; sourceTree = "<group>"; };
@@ -6409,8 +6405,6 @@
 				77C7B653226E0E54001101AC /* RewardsCollectionViewModelTests.swift */,
 				470B771926FCDC8900EBD5CA /* RiskMessagingViewModel.swift */,
 				470B771B26FD022900EBD5CA /* RiskMessagingViewModelTests.swift */,
-				06DC4137266FEE89005205F7 /* RootCommentCellViewModel.swift */,
-				06DC4151266FFE81005205F7 /* RootCommentCellViewModelTests.swift */,
 				A775B5451CA871D700BBB587 /* RootViewModel.swift */,
 				A7ED205F1E83256700BFFA01 /* RootViewModelTests.swift */,
 				D7A37CCE1E2FF93D00EA066D /* SearchEmptyStateCellViewModel.swift */,
@@ -7580,7 +7574,6 @@
 				D798A6AE21656D970053D097 /* Currency.swift in Sources */,
 				77F6E73521222E7C005A5C55 /* EmailFrequency.swift in Sources */,
 				D0237C2622BD7B540092C792 /* PledgeSummaryViewModel.swift in Sources */,
-				06DC4138266FEE89005205F7 /* RootCommentCellViewModel.swift in Sources */,
 				01A7A4C01C9690220036E553 /* UITextField+LocalizedPlaceholderKey.swift in Sources */,
 				3777F2F72343C7900030BEF5 /* ManageViewPledgeRewardReceivedViewModel.swift in Sources */,
 				0176E13B1C9742FD009CA092 /* UIBarButtonItem.swift in Sources */,
@@ -7668,7 +7661,6 @@
 				A7ED1F491E831BA200BFFA01 /* DispatchTimeInterval-Extensions.swift in Sources */,
 				77AA2B3D233D10D3008BBCB8 /* CreateBackingConstructorTests.swift in Sources */,
 				8AD9CF1424C8D46800F77223 /* PledgeShippingSummaryViewModelTests.swift in Sources */,
-				06DC4152266FFE81005205F7 /* RootCommentCellViewModelTests.swift in Sources */,
 				77D19FF22406D5A40058FC8E /* CategorySelectionViewModelTests.swift in Sources */,
 				3706408822A8A6F200889CBD /* PledgeShippingLocationViewModelTests.swift in Sources */,
 				8AFB8C99233E9A1F006779B5 /* CreatePaymentSourceInput+ConstructorTests.swift in Sources */,

KsApi/models/Comment.swift

@@ -25,6 +25,8 @@ public struct Comment {
   public struct Author: Decodable, Equatable {
     public var id: String
     public var imageUrl: String
+    /// TODO(MBL-1025): Get isBlocked status from the backend instead.
+    public var isBlocked: Bool = false
     public var isCreator: Bool
     public var name: String
   }
@@ -60,6 +62,7 @@ extension Comment {
     let author = Author(
       id: "\(user.id)",
       imageUrl: user.avatar.medium,
+      isBlocked: user.isBlocked ?? false,
       isCreator: project.creator == user,
       name: user.name
     )

KsApi/models/User.swift

@@ -8,6 +8,7 @@ public struct User {
   public var isAdmin: Bool?
   public var isEmailVerified: Bool?
   public var isFriend: Bool?
+  public var isBlocked: Bool?
   public var location: Location?
   public var name: String
   public var needsFreshFacebookToken: Bool?
@@ -119,6 +120,7 @@ extension User: Decodable {
     self.isAdmin = try values.decodeIfPresent(Bool.self, forKey: .isAdmin)
     self.isEmailVerified = try values.decodeIfPresent(Bool.self, forKey: .isEmailVerified)
     self.isFriend = try values.decodeIfPresent(Bool.self, forKey: .isFriend)
+    self.isBlocked = try values.decodeIfPresent(Bool.self, forKey: .isBlocked)
     self.location = try? values.decodeIfPresent(Location.self, forKey: .location)
     self.name = try values.decode(String.self, forKey: .name)
     self.needsFreshFacebookToken = try values.decodeIfPresent(Bool.self, forKey: .needsFreshFacebookToken)
@@ -140,6 +142,7 @@ extension User: Decodable {
     case isAdmin = "is_admin"
     case isEmailVerified = "is_email_verified"
     case isFriend = "is_friend"
+    case isBlocked = "is_blocked"
     case location
     case name
     case needsFreshFacebookToken = "needs_fresh_facebook_token"
@@ -160,6 +163,7 @@ extension User: EncodableType {
     result["is_admin"] = self.isAdmin ?? false
     result["is_email_verified"] = self.isEmailVerified ?? false
     result["is_friend"] = self.isFriend ?? false
+    result["is_blocked"] = self.isBlocked ?? false
     result["location"] = self.location?.encode()
     result["name"] = self.name
     result["needs_password"] = self.needsPassword ?? false

KsApi/models/UserTests.swift

@@ -40,6 +40,7 @@ final class UserTests: XCTestCase {
       "is_admin": false,
       "is_email_verified": false,
       "is_friend": false,
+      "is_blocked": false,
       "opted_out_of_recommendations": true,
       "show_public_profile": false,
       "social": true
@@ -98,6 +99,7 @@ final class UserTests: XCTestCase {
       "is_admin": false,
       "is_email_verified": false,
       "is_friend": false,
+      "is_blocked": false,
       "opted_out_of_recommendations": true,
       "show_public_profile": false,
       "social": true

KsApi/models/templates/CommentTemplates.swift

@@ -132,6 +132,23 @@ extension Comment {
     status: .success
   )
 
+  public static let blockedTemplate = Comment(
+    author: Author(
+      id: "ADG8hYbp7gsDAZ==",
+      imageUrl: "https://ks/img/cordero.jpg",
+      isBlocked: true,
+      isCreator: false,
+      name: "Cordero"
+    ),
+    authorBadges: [.superbacker],
+    body: "Since the author is blocked, this comment text should never be seen.",
+    createdAt: Date(timeIntervalSince1970: 1_475_361_115).timeIntervalSince1970,
+    id: "BOD5af89jdDA4fG==",
+    isDeleted: false,
+    replyCount: 0,
+    status: .success
+  )
+
   public static let failedTemplate = Comment(
     author: Author(
       id: "AKLEhYbp7CDO6E==",

Library/ViewModels/CommentCellViewModel.swift

@@ -28,7 +28,7 @@ public protocol CommentCellViewModelOutputs {
   var authorBadge: Signal<Comment.AuthorBadge, Never> { get }
 
   /// Emits a url to the comment author's image.
-  var authorImageURL: Signal<URL, Never> { get }
+  var authorImageURL: Signal<URL?, Never> { get }
 
   /// Emits text containing author's fullname or username.
   var authorName: Signal<String, Never> { get }
@@ -85,13 +85,32 @@ public final class CommentCellViewModel:
       .map { comment, _ in comment }
 
     self.authorImageURL = comment
-      .map(\.author.imageUrl)
+      .map {
+        if $0.author.isBlocked {
+          return "" // Use placeholder avatar instead of URL.
+        } else {
+          return $0.author.imageUrl
+        }
+      }
       .map(URL.init)
-      .skipNil()
 
-    self.body = comment.map(\.body)
+    self.body = comment.map {
+      if $0.author.isBlocked {
+        // TODO(MBL-1026): Use translated string once available.
+        return "This user has been blocked"
+      } else {
+        return $0.body
+      }
+    }
 
-    self.authorName = comment.map(\.author.name)
+    self.authorName = comment.map {
+      if $0.author.isBlocked {
+        // TODO(MBL-1026): Use translated string once available.
+        return "Blocked User"
+      } else {
+        return $0.author.name
+      }
+    }
 
     let status = comment.map(\.status)
 
@@ -109,7 +128,9 @@ public final class CommentCellViewModel:
     let badge = self.commentAndProject.signal
       .skipNil()
       .map { comment, _ in
-        comment.author.id == AppEnvironment.current.currentUser?.id.description ? .you : comment.authorBadge
+        if comment.author.isBlocked { return Comment.AuthorBadge.backer }
+        return comment.author.id == AppEnvironment.current.currentUser?.id.description ? .you : comment
+          .authorBadge
       }
 
     self.authorBadge = Signal.merge(
@@ -195,7 +216,7 @@ public final class CommentCellViewModel:
   }
 
   public let authorBadge: Signal<Comment.AuthorBadge, Never>
-  public var authorImageURL: Signal<URL, Never>
+  public var authorImageURL: Signal<URL?, Never>
   public let authorName: Signal<String, Never>
   public let body: Signal<String, Never>
   public let bottomRowStackViewIsHidden: Signal<Bool, Never>

Library/ViewModels/CommentCellViewModelTests.swift

@@ -9,7 +9,7 @@ internal final class CommentCellViewModelTests: TestCase {
   let vm: CommentCellViewModelType = CommentCellViewModel()
 
   private let authorBadge = TestObserver<Comment.AuthorBadge, Never>()
-  private let authorImageURL = TestObserver<URL, Never>()
+  private let authorImageURL = TestObserver<URL?, Never>()
   private let authorName = TestObserver<String, Never>()
   private let body = TestObserver<String, Never>()
   private let bottomRowStackViewIsHidden = TestObserver<Bool, Never>()
@@ -323,6 +323,16 @@ internal final class CommentCellViewModelTests: TestCase {
     self.authorBadge.assertValues([.backer], "The author's badge is emitted.")
   }
 
+  func testBlockedAuthor() {
+    let comment = Comment.blockedTemplate
+
+    self.vm.inputs.configureWith(comment: comment, project: .template)
+    self.authorBadge.assertValues([.backer], "The default badge is emitted.")
+    self.authorName.assertValue("Blocked User", "The author's name is hidden.")
+    self.authorImageURL.assertValue(nil, "The author's avatar is hidden.")
+    self.body.assertValue("This user has been blocked", "The comment text is hidden.")
+  }
+
   func testBindStylesEmitsAuthorBadge() {
     self.authorBadge.assertDidNotEmitValue()