Merge pull request #1044 from mastodon/ios-157-popular-on-mastodon

Better UI/UX for suggestions for new users (IOS-157)
mastodon · May 25, 2023 · ddf0afc · ddf0afc
2 parents 02d305e + 3597e69
commit ddf0afc
Show file tree

Hide file tree

Showing 42 changed files with 601 additions and 946 deletions.
diff --git a/Localization/app.json b/Localization/app.json
@@ -464,8 +464,8 @@
             }
         },
         "suggestion_account": {
-            "title": "Find People to Follow",
-            "follow_explain": "When you follow someone, you’ll see their posts in your home feed."
+            "title": "Popular on Mastodon",
+            "follow_all": "Follow all"
         },
         "compose": {
             "title": {

diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
diff --git a/Mastodon/Diffable/Account/SelectedAccountItem.swift b/Mastodon/Diffable/Account/SelectedAccountItem.swift
diff --git a/Mastodon/Diffable/Account/SelectedAccountSection.swift b/Mastodon/Diffable/Account/SelectedAccountSection.swift
diff --git a/Mastodon/Diffable/RecommandAccount/RecommendAccountSection.swift b/Mastodon/Diffable/RecommandAccount/RecommendAccountSection.swift
diff --git a/Mastodon/Diffable/Search/SearchHistorySection.swift b/Mastodon/Diffable/Search/SearchHistorySection.swift
@@ -32,7 +32,12 @@ extension SearchHistorySection {
                 guard let user = item.object(in: context.managedObjectContext) else { return }
                 cell.configure(
                     me: authContext.mastodonAuthenticationBox.authenticationRecord.object(in: context.managedObjectContext)?.user,
-                    viewModel: .init(value: user, followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(), blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher()),
+                    viewModel: SearchHistoryUserCollectionViewCell.ViewModel(
+                        value: user,
+                        followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(),
+                        blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher(),
+                        followRequestedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followRequestedUserIDs.eraseToAnyPublisher()
+                    ),
                     delegate: configuration.searchHistorySectionHeaderCollectionReusableViewDelegate
                 )
             }

diff --git a/Mastodon/Diffable/Search/SearchResultSection.swift b/Mastodon/Diffable/Search/SearchResultSection.swift
@@ -53,7 +53,10 @@ extension SearchResultSection {
                         authContext: authContext,
                         tableView: tableView,
                         cell: cell,
-                        viewModel: .init(value: .user(user), followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(), blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher()),
+                        viewModel: UserTableViewCell.ViewModel(value: .user(user),
+                                                               followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(),
+                                                               blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher(),
+                                                               followRequestedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followRequestedUserIDs.eraseToAnyPublisher()),
                         configuration: configuration
                     )
                 }

diff --git a/Mastodon/Diffable/User/UserSection.swift b/Mastodon/Diffable/User/UserSection.swift
@@ -48,7 +48,11 @@ extension UserSection {
                         authContext: authContext,
                         tableView: tableView,
                         cell: cell,
-                        viewModel: .init(value: .user(user), followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(), blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher()),
+                        viewModel: UserTableViewCell.ViewModel(value: .user(user),
+                                         followedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followingUserIds.eraseToAnyPublisher(),
+                                         blockedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$blockedUserIds.eraseToAnyPublisher(),
+                                         followRequestedUsers: authContext.mastodonAuthenticationBox.inMemoryCache.$followRequestedUserIDs.eraseToAnyPublisher()
+                                        ),
                         configuration: configuration
                     )
                 }

diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift
@@ -32,7 +32,7 @@ extension DataSourceFacade {
     static func responseToUserFollowRequestAction(
         dependency: NeedsDependency & AuthContextProvider,
         notification: ManagedObjectRecord<Notification>,
-        query: Mastodon.API.Account.FollowReqeustQuery
+        query: Mastodon.API.Account.FollowRequestQuery
     ) async throws {
         let selectionFeedbackGenerator = await UISelectionFeedbackGenerator()
         await selectionFeedbackGenerator.selectionChanged()

diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+UserView.swift b/Mastodon/Protocol/Provider/DataSourceFacade+UserView.swift
@@ -22,6 +22,17 @@ extension DataSourceFacade {
             if let userObject = user.object(in: dependency.context.managedObjectContext) {
                 dependency.authContext.mastodonAuthenticationBox.inMemoryCache.followingUserIds.append(userObject.id)
             }
+
+        case .request:
+            try await DataSourceFacade.responseToUserFollowAction(
+                dependency: dependency,
+                user: user
+            )
+
+            if let userObject = user.object(in: dependency.context.managedObjectContext) {
+                dependency.authContext.mastodonAuthenticationBox.inMemoryCache.followRequestedUserIDs.append(userObject.id)
+            }
+
         case .unfollow:
             try await DataSourceFacade.responseToUserFollowAction(
                 dependency: dependency,
@@ -39,6 +50,16 @@ extension DataSourceFacade {
             if let userObject = user.object(in: dependency.context.managedObjectContext) {
                 dependency.authContext.mastodonAuthenticationBox.inMemoryCache.blockedUserIds.append(userObject.id)
             }
+
+        case .pending:
+            try await DataSourceFacade.responseToUserFollowAction(
+                dependency: dependency,
+                user: user
+            )
+
+            if let userObject = user.object(in: dependency.context.managedObjectContext) {
+                dependency.authContext.mastodonAuthenticationBox.inMemoryCache.followRequestedUserIDs.removeAll(where: { $0 == userObject.id })
+            }
         case .none, .loading:
             break //no-op
         }

diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift
@@ -240,6 +240,19 @@ extension HomeTimelineViewController {
             .sink { [weak self] isEmpty in
                 if isEmpty {
                     self?.showEmptyView()
+
+                    let userDoesntFollowPeople: Bool
+                    if let managedObjectContext = self?.context.managedObjectContext,
+                       let me = self?.authContext.mastodonAuthenticationBox.authenticationRecord.object(in: managedObjectContext)?.user {
+                        userDoesntFollowPeople = me.followersCount == 0
+                    } else {
+                        userDoesntFollowPeople = true
+                    }
+
+                    if (self?.viewModel.presentedSuggestions == false) && userDoesntFollowPeople {
+                        self?.findPeopleButtonPressed(self)
+                        self?.viewModel.presentedSuggestions = true
+                    }
                 } else {
                     self?.emptyView.removeFromSuperview()
                 }
@@ -285,8 +298,6 @@ extension HomeTimelineViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        viewModel.viewDidAppear.send()
-
         if let timestamp = viewModel.lastAutomaticFetchTimestamp {
             let now = Date()
             if now.timeIntervalSince(timestamp) > 60 {
@@ -360,6 +371,7 @@ extension HomeTimelineViewController {
         bottomPaddingView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             topPaddingView.heightAnchor.constraint(equalTo: bottomPaddingView.heightAnchor, multiplier: 0.8),
+            manuallySearchButton.heightAnchor.constraint(greaterThanOrEqualToConstant: 20),
         ])
 
         let buttonContainerStackView = UIStackView()
@@ -374,9 +386,10 @@ extension HomeTimelineViewController {
     }
 }
 
+//MARK: - Actions
 extension HomeTimelineViewController {
 
-    @objc private func findPeopleButtonPressed(_ sender: PrimaryActionButton) {
+    @objc private func findPeopleButtonPressed(_ sender: Any?) {
         let suggestionAccountViewModel = SuggestionAccountViewModel(context: context, authContext: viewModel.authContext)
         suggestionAccountViewModel.delegate = viewModel
         _ = coordinator.present(
@@ -387,13 +400,11 @@ extension HomeTimelineViewController {
     }
 
     @objc private func manuallySearchButtonPressed(_ sender: UIButton) {
-        os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
         let searchDetailViewModel = SearchDetailViewModel(authContext: viewModel.authContext)
         _ = coordinator.present(scene: .searchDetail(viewModel: searchDetailViewModel), from: self, transition: .modal(animated: true, completion: nil))
     }
 
     @objc private func settingBarButtonItemPressed(_ sender: UIBarButtonItem) {
-        os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
         guard let setting = context.settingService.currentSetting.value else { return }
         let settingsViewModel = SettingsViewModel(context: context, authContext: viewModel.authContext, setting: setting)
         _ = coordinator.present(scene: .settings(viewModel: settingsViewModel), from: self, transition: .modal(animated: true, completion: nil))

diff --git a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift b/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
@@ -30,7 +30,8 @@ final class HomeTimelineViewModel: NSObject {
     let fetchedResultsController: FeedFetchedResultsController
     let homeTimelineNavigationBarTitleViewModel: HomeTimelineNavigationBarTitleViewModel
     let listBatchFetchViewModel = ListBatchFetchViewModel()
-    let viewDidAppear = PassthroughSubject<Void, Never>()
+
+    var presentedSuggestions = false
 
     @Published var lastAutomaticFetchTimestamp: Date? = nil
     @Published var scrollPositionRecord: ScrollPositionRecord? = nil

diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
@@ -301,7 +301,7 @@ extension MastodonLoginViewController: MastodonLoginViewModelDelegate {
 
         dataSource?.apply(snapshot, animatingDifferences: false)
 
-        OperationQueue.main.addOperation {
+        DispatchQueue.main.async {
             let numberOfResults = viewModel.filteredServers.count
             self.contentView.updateCorners(numberOfResults: numberOfResults)
         }