Remove .newsletterSubscribers FF (#24913)

* Remove .newsletterSubscribers FF

* Remove follower mode from PersonViewController

* Remoev Followers mode from PeopleViewController

Author: kean

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -24,7 +24,6 @@ public enum FeatureFlag: Int, CaseIterable {
     case selfHostedSiteUserManagement
     case readerGutenbergCommentComposer
     case pluginManagementOverhaul
-    case newsletterSubscribers
     case newStats
     case newPublishingSheet
     case mediaQuotaView
@@ -81,8 +80,6 @@ public enum FeatureFlag: Int, CaseIterable {
             return false
         case .pluginManagementOverhaul:
             return false
-        case .newsletterSubscribers:
-            return true
         case .newStats:
             return false
         case .newPublishingSheet:
@@ -133,7 +130,6 @@ extension FeatureFlag {
         case .selfHostedSiteUserManagement: "Self-hosted Site User Management"
         case .pluginManagementOverhaul: "Plugin Management Overhaul"
         case .readerGutenbergCommentComposer: "Gutenberg Comment Composer"
-        case .newsletterSubscribers: "Newsletter Subscribers"
         case .newStats: "New Stats"
         case .newPublishingSheet: "New Publishing Sheet"
         case .mediaQuotaView: "Media Quota"

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+Swift.swift

@@ -10,7 +10,7 @@ import WordPressCore
 
 extension BlogDetailsViewController {
     @objc public var shouldShowSubscribersRow: Bool {
-        FeatureFlag.newsletterSubscribers.enabled && blog.supports(.people)
+        blog.supports(.people)
     }
 
     @objc public func makeSubscribersRow() -> BlogDetailsRow {

WordPress/Classes/ViewRelated/People/Controllers/InvitePersonViewController.swift

@@ -51,19 +51,7 @@ class InvitePersonViewController: UITableViewController {
     /// Roles available for the current site
     ///
     fileprivate var availableRoles: [RemoteRole] {
-        let blogRoles = blog?.sortedRoles ?? []
-        var roles = [RemoteRole]()
-        let inviteRole: RemoteRole
-        if blog.isPrivateAtWPCom() {
-            inviteRole = RemoteRole.viewer
-        } else {
-            inviteRole = RemoteRole.follower
-        }
-        roles += blogRoles.map({ $0.toUnmanaged() })
-        if !FeatureFlag.newsletterSubscribers.enabled {
-            roles.append(inviteRole)
-        }
-        return roles
+        (blog?.sortedRoles ?? []).map { $0.toUnmanaged() }
     }
 
     private lazy var inviteActivityView: UIActivityIndicatorView = {

WordPress/Classes/ViewRelated/People/Controllers/PeopleViewController.swift

@@ -16,7 +16,7 @@ class PeopleViewController: UITableViewController {
     ///
     private var blog: Blog?
 
-    /// Mode: Users / Followers
+    /// Mode: Users
     ///
     private var filter = Filter.users {
         didSet {
@@ -70,15 +70,7 @@ class PeopleViewController: UITableViewController {
     /// Sort Descriptor
     ///
     private var sortDescriptors: [NSSortDescriptor] {
-        // Note:
-        // Followers must be sorted out by creationDate!
-        //
-        switch filter {
-        case .followers:
-            return [NSSortDescriptor(key: "creationDate", ascending: true, selector: #selector(NSDate.compare(_:)))]
-        default:
-            return [NSSortDescriptor(key: "displayName", ascending: true, selector: #selector(NSString.localizedCaseInsensitiveCompare(_:)))]
-        }
+        [NSSortDescriptor(key: "displayName", ascending: true, selector: #selector(NSString.localizedCaseInsensitiveCompare(_:)))]
     }
 
     private var viewContext: NSManagedObjectContext {
@@ -192,14 +184,6 @@ class PeopleViewController: UITableViewController {
                 return
             }
             navigationController?.pushViewController(viewController, animated: true)
-        case .followers:
-            let url = URL(string: "https://wordpress.com/subscribers/\(blogId)/\(personAtIndexPath(indexPath).ID)")
-            let configuration = WebViewControllerConfiguration(url: url)
-            configuration.authenticateWithDefaultAccount()
-            configuration.secureInteraction = true
-            let viewController = WebKitViewController(configuration: configuration)
-            let navWrapper = UINavigationController(rootViewController: viewController)
-            navigationController?.present(navWrapper, animated: true)
         }
     }
 
@@ -282,19 +266,12 @@ extension PeopleViewController {
     enum Filter: String, CaseIterable, FilterTabBarItem {
 
         case users = "users"
-        case followers = "followers"
         case viewers = "viewers"
 
-        static var defaultFilters: [Filter] {
-            return [.users, .followers]
-        }
-
         var title: String {
             switch self {
             case .users:
                 return NSLocalizedString("Users", comment: "Blog Users")
-            case .followers:
-                return NSLocalizedString("users.list.title.subscribers", value: "Subscribers", comment: "Site Subscribers")
             case .viewers:
                 return NSLocalizedString("Viewers", comment: "Blog Viewers")
             }
@@ -304,21 +281,15 @@ extension PeopleViewController {
             switch self {
             case .users:
                 return .user
-            case .followers:
-                return .follower
             case .viewers:
                 return .viewer
             }
         }
 
         var screenMode: PersonViewController.ScreenMode {
             switch self {
-            case .users:
-                return .User
-            case .followers:
-                return .Follower
-            case .viewers:
-                return .Viewer
+            case .users: .user
+            case .viewers: .viewer
             }
         }
     }
@@ -402,8 +373,6 @@ private extension PeopleViewController {
         }
 
         switch filter {
-        case .followers:
-            service.loadFollowersPage(offset, success: success)
         case .users:
             loadUsersPage(offset, success: success)
         case .viewers:
@@ -579,20 +548,6 @@ private extension PeopleViewController {
     }
 }
 
-extension PeopleViewController {
-    class func controllerWithBlog(_ blog: Blog, selectedFilter: Filter) -> PeopleViewController? {
-        let storyboard = UIStoryboard(name: "People", bundle: .keystone)
-        guard let viewController = storyboard.instantiateInitialViewController() as? PeopleViewController else {
-            return nil
-        }
-
-        viewController.defaultFilter = selectedFilter
-        viewController.blog = blog
-
-        return viewController
-    }
-}
-
 private enum Strings {
     static let title = NSLocalizedString("users.title", value: "Users", comment: "Screen title")
 }

WordPress/Classes/ViewRelated/People/Controllers/PersonViewController.swift

@@ -21,18 +21,15 @@ final class PersonViewController: UITableViewController {
     /// PersonViewController operation modes
     ///
     enum ScreenMode: String {
-        case User = "user"
-        case Follower = "follower"
-        case Viewer = "viewer"
+        case user = "user"
+        case viewer = "viewer"
 
         var title: String {
             switch self {
-            case .User:
-                return NSLocalizedString("user.details.title.user", value: "Site's User", comment: "Sites's User Profile. Displayed when the name is empty!")
-            case .Follower:
-                return NSLocalizedString("user.details.title.subscriber", value: "Site's Subscriber", comment: "Site's Subscriber Profile. Displayed when the name is empty!")
-            case .Viewer:
-                return NSLocalizedString("user.details.title.viewer", value: "Site's Viewer", comment: "Site's Viewers Profile. Displayed when the name is empty!")
+            case .user:
+                NSLocalizedString("user.details.title.user", value: "Site's User", comment: "Sites's User Profile. Displayed when the name is empty!")
+            case .viewer:
+                NSLocalizedString("user.details.title.viewer", value: "Site's Viewer", comment: "Site's Viewers Profile. Displayed when the name is empty!")
             }
         }
     }
@@ -53,7 +50,7 @@ final class PersonViewController: UITableViewController {
         }
     }
 
-    /// Mode: User / Follower / Viewer / Email Follower
+    /// Mode: User / Viewer
     ///
     private let screenMode: ScreenMode
 
@@ -210,8 +207,8 @@ private extension PersonViewController {
 
     func removeWasPressed() {
         let titleFormat = NSLocalizedString("Remove %@", comment: "Remove Person Alert Title")
-        let titleText = String(format: titleFormat, isEmailFollower ? person.displayName : "@" + person.username)
-        let name = person.firstName?.nonEmptyString() ?? (isEmailFollower ? person.displayName : person.username)
+        let titleText = String(format: titleFormat, person.username)
+        let name = person.firstName?.nonEmptyString() ?? person.username
         let message = warningTextForRemovingPerson(name)
         let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel Action")
         let removeTitle = NSLocalizedString("Remove", comment: "Remove Action")
@@ -226,11 +223,9 @@ private extension PersonViewController {
             }
 
             switch strongSelf.screenMode {
-            case .User:
+            case .user:
                 strongSelf.deleteUser()
-            case .Follower:
-                strongSelf.deleteFollower()
-            case .Viewer:
+            case .viewer:
                 strongSelf.deleteViewer()
                 return
             }
@@ -242,20 +237,17 @@ private extension PersonViewController {
     func warningTextForRemovingPerson(_ name: String) -> String {
         var messageFirstLine: String
         switch screenMode {
-        case .User:
+        case .user:
             let text = NSLocalizedString("If you remove %@, that user will no longer be able to access this site, but any content that was created by %@ will remain on the site.",
                                          comment: "First line of remove user warning in confirmation dialog. Note: '%@' is the placeholder for the user's name and it must exist twice in this string.")
             messageFirstLine = String.localizedStringWithFormat(text, name, name)
-        case .Follower:
-            messageFirstLine = NSLocalizedString("Removing followers makes them stop receiving updates from your site. If they choose to, they can still visit your site, and follow it again.",
-                                                 comment: "First line of remove follower warning in confirmation dialog.")
-        case .Viewer:
+        case .viewer:
             messageFirstLine = NSLocalizedString("If you remove this viewer, he or she will not be able to visit this site.",
                                                  comment: "First line of remove viewer warning in confirmation dialog.")
         }
 
         let messageSecondLineText = NSLocalizedString("Would you still like to remove this person?",
-                                                      comment: "Second line of Remove user/follower/viewer warning in confirmation dialog.")
+                                                      comment: "Second line of Remove user/viewer warning in confirmation dialog.")
 
         return messageFirstLine + "\n\n" + messageSecondLineText
     }
@@ -279,23 +271,6 @@ private extension PersonViewController {
         _ = navigationController?.popViewController(animated: true)
     }
 
-    func deleteFollower() {
-        guard let follower, isFollower else {
-            DDLogError("Error: Only Followers can be deleted here")
-            assertionFailure()
-            return
-        }
-
-        service?.deleteFollower(follower, failure: {[weak self] (error: Error?) -> () in
-            guard let strongSelf = self, let error = error as NSError? else {
-                return
-            }
-
-            strongSelf.handleRemoveViewerOrFollowerError(error)
-        })
-        _ = navigationController?.popViewController(animated: true)
-    }
-
     func deleteViewer() {
         guard let viewer, isViewer else {
             DDLogError("Error: Only Viewers can be deleted here")
@@ -310,7 +285,7 @@ private extension PersonViewController {
                 return
             }
 
-            strongSelf.handleRemoveViewerOrFollowerError(error)
+            strongSelf.handleRemoveViewerError(error)
         })
         _ = navigationController?.popViewController(animated: true)
     }
@@ -333,7 +308,7 @@ private extension PersonViewController {
         WPError.showAlert(withTitle: errorTitleText, message: errorMessage, withSupportButton: true)
     }
 
-    func handleRemoveViewerOrFollowerError(_ error: NSError) {
+    func handleRemoveViewerError(_ error: NSError) {
         let errorWithSource = NSError(domain: error.domain, code: error.code, userInfo: error.userInfo)
         WPError.showNetworkingAlertWithError(errorWithSource)
     }
@@ -396,7 +371,7 @@ private extension PersonViewController {
         }
         headerCell.fullNameLabel.font = .preferredFont(forTextStyle: .headline)
         headerCell.fullNameLabel.textColor = .label
-        headerCell.fullNameLabel.text = isEmailFollower ? person.displayName : person.fullName
+        headerCell.fullNameLabel.text = person.fullName
 
         headerCell.userNameLabel.font = .preferredFont(forTextStyle: .subheadline)
         headerCell.userNameLabel.textColor = .secondaryLabel
@@ -425,7 +400,7 @@ private extension PersonViewController {
     func configureRemoveCell(_ cell: UITableViewCell) {
         WPStyleGuide.configureTableViewDestructiveActionCell(cell)
         let removeFormat = NSLocalizedString("Remove %@", comment: "Remove User. Verb")
-        let removeText = String(format: removeFormat, isEmailFollower ? person.displayName : "@" + person.username)
+        let removeText = String(format: removeFormat, person.username)
         cell.textLabel?.text = removeText as String
         cell.isHidden = !isRemoveEnabled
     }
@@ -504,7 +479,7 @@ private extension PersonViewController {
     }
 
     var isFullnamePrivate: Bool {
-        // Followers + Viewers shouldn't display First / Last name
+        // Viewers shouldn't display First / Last name
         return isUser == false
     }
 
@@ -516,12 +491,10 @@ private extension PersonViewController {
 
     var isRemoveEnabled: Bool {
         switch screenMode {
-        case .User:
+        case .user:
             // YES, ListUsers. Brought from Calypso's code
             return blog.isUserCapableOf(.ListUsers) && isMyself == false && isUser == true
-        case .Follower:
-            return isFollower == true
-        case .Viewer:
+        case .viewer:
             return isViewer == true
         }
     }
@@ -534,22 +507,6 @@ private extension PersonViewController {
         return person as? User
     }
 
-    var isFollower: Bool {
-        return follower != nil
-    }
-
-    var follower: Follower? {
-        return person as? Follower
-    }
-
-    var isEmailFollower: Bool {
-        return person is EmailFollower
-    }
-
-    var emailFollower: EmailFollower? {
-        return person as? EmailFollower
-    }
-
     var isViewer: Bool {
         return viewer != nil
     }
@@ -560,11 +517,9 @@ private extension PersonViewController {
 
     var role: RemoteRole? {
         switch screenMode {
-        case .Follower:
-            return .follower
-        case .Viewer:
+        case .viewer:
             return .viewer
-        case .User:
+        case .user:
             return try? Role.lookup(withBlogID: blog.objectID, slug: person.role, in: context)?.toUnmanaged()
         }
     }