Tusker.xcodeproj/project.pbxproj

@@ -216,7 +216,7 @@
 		D68ACE5D279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68ACE5C279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift */; };
 		D68C2AE325869BAB00548EFF /* AuxiliarySceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68C2AE225869BAB00548EFF /* AuxiliarySceneDelegate.swift */; };
 		D68E525B24A3D77E0054355A /* TuskerRootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E525A24A3D77E0054355A /* TuskerRootViewController.swift */; };
-		D68E525D24A3E8F00054355A /* InlineTrendsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */; };
+		D68E525D24A3E8F00054355A /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E525C24A3E8F00054355A /* SearchViewController.swift */; };
 		D68E6F59253C9969001A1B4C /* MultiSourceEmojiLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */; };
 		D68E6F5F253C9B2D001A1B4C /* BaseEmojiLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68E6F5E253C9B2D001A1B4C /* BaseEmojiLabel.swift */; };
 		D68FEC4F232C5BC300C84F23 /* SegmentedPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D68FEC4E232C5BC300C84F23 /* SegmentedPageViewController.swift */; };
@@ -298,7 +298,6 @@
 		D6C3F4F5298ED0890009FCFF /* LocalPredicateStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */; };
 		D6C3F4F7298ED7F70009FCFF /* FavoritesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F6298ED7F70009FCFF /* FavoritesViewController.swift */; };
 		D6C3F4F9298EDBF20009FCFF /* ConversationTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4F8298EDBF20009FCFF /* ConversationTree.swift */; };
-		D6C3F4FB299035650009FCFF /* TrendsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C3F4FA299035650009FCFF /* TrendsViewController.swift */; };
 		D6C693EF216192C2007D6A6D /* TuskerNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */; };
 		D6C693FC2162FE6F007D6A6D /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */; };
 		D6C693FE2162FEEA007D6A6D /* UIViewController+Children.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */; };
@@ -627,7 +626,7 @@
 		D68ACE5C279B1ABA001CE8EB /* AssetPickerControlCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetPickerControlCollectionViewCell.swift; sourceTree = "<group>"; };
 		D68C2AE225869BAB00548EFF /* AuxiliarySceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuxiliarySceneDelegate.swift; sourceTree = "<group>"; };
 		D68E525A24A3D77E0054355A /* TuskerRootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerRootViewController.swift; sourceTree = "<group>"; };
-		D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineTrendsViewController.swift; sourceTree = "<group>"; };
+		D68E525C24A3E8F00054355A /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
 		D68E6F58253C9969001A1B4C /* MultiSourceEmojiLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiSourceEmojiLabel.swift; sourceTree = "<group>"; };
 		D68E6F5E253C9B2D001A1B4C /* BaseEmojiLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseEmojiLabel.swift; sourceTree = "<group>"; };
 		D68FEC4E232C5BC300C84F23 /* SegmentedPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentedPageViewController.swift; sourceTree = "<group>"; };
@@ -709,7 +708,6 @@
 		D6C3F4F4298ED0890009FCFF /* LocalPredicateStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalPredicateStatusesViewController.swift; sourceTree = "<group>"; };
 		D6C3F4F6298ED7F70009FCFF /* FavoritesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesViewController.swift; sourceTree = "<group>"; };
 		D6C3F4F8298EDBF20009FCFF /* ConversationTree.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationTree.swift; sourceTree = "<group>"; };
-		D6C3F4FA299035650009FCFF /* TrendsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendsViewController.swift; sourceTree = "<group>"; };
 		D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TuskerNavigationDelegate.swift; sourceTree = "<group>"; };
 		D6C693FB2162FE6F007D6A6D /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
 		D6C693FD2162FEEA007D6A6D /* UIViewController+Children.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Children.swift"; sourceTree = "<group>"; };
@@ -927,7 +925,6 @@
 			isa = PBXGroup;
 			children = (
 				D6C82B4025C5BB7E0017F1E6 /* ExploreViewController.swift */,
-				D68E525C24A3E8F00054355A /* InlineTrendsViewController.swift */,
 				D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */,
 				D6093F9A25BDD4B9004811E6 /* HashtagSearchResultsViewController.swift */,
 				D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */,
@@ -942,7 +939,6 @@
 				D693A72925CF8C1E003A14E2 /* ProfileDirectoryViewController.swift */,
 				D693A72D25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift */,
 				D693A72E25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.xib */,
-				D6C3F4FA299035650009FCFF /* TrendsViewController.swift */,
 			);
 			path = Explore;
 			sourceTree = "<group>";
@@ -1414,6 +1410,7 @@
 		D6BC9DD8232D8BCA002CA326 /* Search */ = {
 			isa = PBXGroup;
 			children = (
+				D68E525C24A3E8F00054355A /* SearchViewController.swift */,
 				D6BC9DD9232D8BE5002CA326 /* SearchResultsViewController.swift */,
 			);
 			path = Search;
@@ -1962,7 +1959,7 @@
 				D61F759229365C6C00C0B37F /* CollectionViewController.swift in Sources */,
 				D6DD8FFD298495A8002AD3FD /* LogoutService.swift in Sources */,
 				04DACE8C212CB14B009840C4 /* MainTabBarViewController.swift in Sources */,
-				D68E525D24A3E8F00054355A /* InlineTrendsViewController.swift in Sources */,
+				D68E525D24A3E8F00054355A /* SearchViewController.swift in Sources */,
 				D61F75BB293C183100C0B37F /* HTMLConverter.swift in Sources */,
 				D61F75A5293ABD6F00C0B37F /* EditFilterView.swift in Sources */,
 				D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */,
@@ -2181,7 +2178,6 @@
 				D6E77D0B286D426E00D8B732 /* TrendingLinkCardCollectionViewCell.swift in Sources */,
 				D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */,
 				D65B4B58297203A700DABDFB /* ReportSelectRulesView.swift in Sources */,
-				D6C3F4FB299035650009FCFF /* TrendsViewController.swift in Sources */,
 				D6B81F442560390300F6E31D /* MenuController.swift in Sources */,
 				D65B4B542971F71D00DABDFB /* EditedReport.swift in Sources */,
 				D65234E12561AA68001AF9CF /* NotificationsTableViewController.swift in Sources */,

Tusker/Preferences/Preferences.swift

@@ -80,7 +80,7 @@ class Preferences: Codable, ObservableObject {
         self.defaultNotificationsMode = try container.decode(NotificationsMode.self, forKey: .defaultNotificationsType)
         self.grayscaleImages = try container.decodeIfPresent(Bool.self, forKey: .grayscaleImages) ?? false
         self.disableInfiniteScrolling = try container.decodeIfPresent(Bool.self, forKey: .disableInfiniteScrolling) ?? false
-        self.hideTrends = try container.decodeIfPresent(Bool.self, forKey: .hideTrends) ?? false
+        self.hideDiscover = try container.decodeIfPresent(Bool.self, forKey: .hideDiscover) ?? false
         
         self.statusContentType = try container.decode(StatusContentType.self, forKey: .statusContentType)
         
@@ -130,7 +130,7 @@ class Preferences: Codable, ObservableObject {
         try container.encode(defaultNotificationsMode, forKey: .defaultNotificationsType)
         try container.encode(grayscaleImages, forKey: .grayscaleImages)
         try container.encode(disableInfiniteScrolling, forKey: .disableInfiniteScrolling)
-        try container.encode(hideTrends, forKey: .hideTrends)
+        try container.encode(hideDiscover, forKey: .hideDiscover)
         
         try container.encode(statusContentType, forKey: .statusContentType)
         
@@ -190,7 +190,7 @@ class Preferences: Codable, ObservableObject {
     @Published var defaultNotificationsMode = NotificationsMode.allNotifications
     @Published var grayscaleImages = false
     @Published var disableInfiniteScrolling = false
-    @Published var hideTrends = false
+    @Published var hideDiscover = false
     
     // MARK: Advanced
     @Published var statusContentType: StatusContentType = .plain
@@ -241,7 +241,7 @@ class Preferences: Codable, ObservableObject {
         case defaultNotificationsType
         case grayscaleImages
         case disableInfiniteScrolling
-        case hideTrends = "hideDiscover"
+        case hideDiscover
         
         case statusContentType
         

Tusker/Scenes/AuxiliarySceneDelegate.swift

@@ -82,7 +82,7 @@ class AuxiliarySceneDelegate: UIResponder, UIWindowSceneDelegate {
             return NotificationsPageViewController(initialMode: mode, mastodonController: mastodonController)
             
         case .search:
-            return InlineTrendsViewController(mastodonController: mastodonController)
+            return SearchViewController(mastodonController: mastodonController)
             
         case .bookmarks:
             return BookmarksViewController(mastodonController: mastodonController)

Tusker/Screens/Explore/ExploreViewController.swift

@@ -156,7 +156,7 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         snapshot.appendSections(Section.allCases.filter { $0 != .discover })
         snapshot.appendItems([.bookmarks, .favorites], toSection: .bookmarks)
         if mastodonController.instanceFeatures.trends,
-           !Preferences.shared.hideTrends {
+           !Preferences.shared.hideDiscover {
             addDiscoverSection(to: &snapshot)
         }
         snapshot.appendItems([.addList], toSection: .lists)
@@ -175,17 +175,19 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
     
     private func addDiscoverSection(to snapshot: inout NSDiffableDataSourceSnapshot<Section, Item>) {
         snapshot.insertSections([.discover], afterSection: .bookmarks)
-        snapshot.appendItems([.trends], toSection: .discover)
+        snapshot.appendItems([.trendingTags, .profileDirectory], toSection: .discover)
+        if mastodonController.instanceFeatures.trendingStatusesAndLinks {
+            snapshot.insertItems([.trendingStatuses], beforeItem: .trendingTags)
+            snapshot.insertItems([.trendingLinks], afterItem: .trendingTags)
+        }
     }
     
     private func ownInstanceLoaded(_ instance: Instance) {
         var snapshot = self.dataSource.snapshot()
         if mastodonController.instanceFeatures.trends,
            !snapshot.sectionIdentifiers.contains(.discover) {
-            addDiscoverSection(to: &snapshot)
+            snapshot.insertSections([.discover], afterSection: .bookmarks)
-        } else if !mastodonController.instanceFeatures.trends,
+            snapshot.appendItems([.trendingTags, .profileDirectory], toSection: .discover)
-                  snapshot.sectionIdentifiers.contains(.discover) {
-            snapshot.deleteSections([.discover])
         }
         self.dataSource.apply(snapshot)
     }
@@ -248,7 +250,7 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
     @objc private func preferencesChanged() {
         var snapshot = dataSource.snapshot()
         let hasSection = snapshot.sectionIdentifiers.contains(.discover)
-        let hide = Preferences.shared.hideTrends
+        let hide = Preferences.shared.hideDiscover
         if hasSection && hide {
             snapshot.deleteSections([.discover])
         } else if !hasSection && !hide {
@@ -337,8 +339,17 @@ class ExploreViewController: UIViewController, UICollectionViewDelegate, Collect
         case .favorites:
             show(FavoritesViewController(mastodonController: mastodonController), sender: nil)
             
-        case .trends:
+        case .trendingStatuses:
-            show(TrendsViewController(mastodonController: mastodonController), sender: nil)
+            show(TrendingStatusesViewController(mastodonController: mastodonController), sender: nil)
+            
+        case .trendingTags:
+            show(TrendingHashtagsViewController(mastodonController: mastodonController), sender: nil)
+            
+        case .trendingLinks:
+            show(TrendingLinksViewController(mastodonController: mastodonController), sender: nil)
+            
+        case .profileDirectory:
+            show(ProfileDirectoryViewController(mastodonController: mastodonController), sender: nil)
             
         case let .list(list):
             show(ListTimelineViewController(for: list, mastodonController: mastodonController), sender: nil)
@@ -387,7 +398,7 @@ extension ExploreViewController {
             case .bookmarks:
                 return  nil
             case .discover:
-                return nil
+                return NSLocalizedString("Discover", comment: "discover section title")
             case .lists:
                 return NSLocalizedString("Lists", comment: "explore lists section title")
             case .savedHashtags:
@@ -401,7 +412,10 @@ extension ExploreViewController {
     enum Item: Hashable {
         case bookmarks
         case favorites
-        case trends
+        case trendingStatuses
+        case trendingTags
+        case trendingLinks
+        case profileDirectory
         case list(List)
         case addList
         case savedHashtag(Hashtag)
@@ -415,8 +429,14 @@ extension ExploreViewController {
                 return NSLocalizedString("Bookmarks", comment: "bookmarks nav item title")
             case .favorites:
                 return NSLocalizedString("Favorites", comment: "favorites nav item title")
-            case .trends:
+            case .trendingStatuses:
-                return NSLocalizedString("Trends", comment: "trends nav item title")
+                return NSLocalizedString("Trending Posts", comment: "trending statuses nav item title")
+            case .trendingTags:
+                return NSLocalizedString("Trending Hashtags", comment: "trending hashtags nav item title")
+            case .trendingLinks:
+                return NSLocalizedString("Trending Links", comment: "trending links nav item title")
+            case .profileDirectory:
+                return NSLocalizedString("Profile Directory", comment: "profile directory nav item title")
             case let .list(list):
                 return list.title
             case .addList:
@@ -439,8 +459,14 @@ extension ExploreViewController {
                 name = "bookmark.fill"
             case .favorites:
                 name = "star.fill"
-            case .trends:
+            case .trendingStatuses:
-                name = "chart.line.uptrend.xyaxis"
+                name = "doc.text.image"
+            case .trendingTags:
+                name = "number"
+            case .trendingLinks:
+                name = "link"
+            case .profileDirectory:
+                name = "person.2.fill"
             case .list(_):
                 name = "list.bullet"
             case .addList, .addSavedHashtag:
@@ -461,7 +487,13 @@ extension ExploreViewController {
                 return true
             case (.favorites, .favorites):
                 return true
-            case (.trends, .trends):
+            case (.trendingStatuses, .trendingStatuses):
+                return true
+            case (.trendingTags, .trendingTags):
+                return true
+            case (.trendingLinks, .trendingLinks):
+                return true
+            case (.profileDirectory, .profileDirectory):
                 return true
             case let (.list(a), .list(b)):
                 return a.id == b.id && a.title == b.title
@@ -486,8 +518,14 @@ extension ExploreViewController {
                 hasher.combine("bookmarks")
             case .favorites:
                 hasher.combine("favorites")
-            case .trends:
+            case .trendingStatuses:
-                hasher.combine("trends")
+                hasher.combine("trendingStatuses")
+            case .trendingTags:
+                hasher.combine("trendingTags")
+            case .trendingLinks:
+                hasher.combine("trendingLinks")
+            case .profileDirectory:
+                hasher.combine("profileDirectory")
             case let .list(list):
                 hasher.combine("list")
                 hasher.combine(list.id)

Tusker/Screens/Explore/InlineTrendsViewController.swift

@@ -1,79 +0,0 @@
-//
-//  InlineTrendsViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/24/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-class InlineTrendsViewController: UIViewController {
-
-    weak var mastodonController: MastodonController!
-    
-    var resultsController: SearchResultsViewController!
-    var searchController: UISearchController!
-    
-    var searchControllerStatusOnAppearance: Bool? = nil
-    
-    init(mastodonController: MastodonController) {
-        self.mastodonController = mastodonController
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        title = NSLocalizedString("Explore", comment: "explore tab title")
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        resultsController = SearchResultsViewController(mastodonController: mastodonController)
-        resultsController.exploreNavigationController = self.navigationController
-        searchController = UISearchController(searchResultsController: resultsController)
-        searchController.obscuresBackgroundDuringPresentation = true
-        if #available(iOS 16.0, *) {
-            searchController.scopeBarActivation = .onSearchActivation
-        }
-        searchController.searchBar.autocapitalizationType = .none
-        searchController.searchBar.delegate = resultsController
-        searchController.searchBar.scopeButtonTitles = SearchResultsViewController.Scope.allCases.map(\.title)
-        searchController.hidesNavigationBarDuringPresentation = false
-        definesPresentationContext = true
-
-        navigationItem.searchController = searchController
-        navigationItem.hidesSearchBarWhenScrolling = false
-        if #available(iOS 16.0, *) {
-            navigationItem.preferredSearchBarPlacement = .stacked
-        }
-        
-        let trends = TrendsViewController(mastodonController: mastodonController)
-        trends.view.translatesAutoresizingMaskIntoConstraints = false
-        addChild(trends)
-        view.addSubview(trends.view)
-        NSLayoutConstraint.activate([
-            trends.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            trends.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            trends.view.topAnchor.constraint(equalTo: view.topAnchor),
-            trends.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-        ])
-        trends.didMove(toParent: self)
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        // this is a workaround for the issue that setting isActive on a search controller that is not visible
-        // does not cause it to automatically become active once it becomes visible
-        // see FB7814561
-        if let active = searchControllerStatusOnAppearance {
-            searchController.isActive = active
-            searchControllerStatusOnAppearance = nil
-        }
-    }
-    
-}

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -41,7 +41,7 @@ class MainSidebarViewController: UIViewController {
     }
     
     var exploreTabItems: [Item] {
-        var items: [Item] = [.explore, .bookmarks, .favorites]
+        var items: [Item] = [.explore, .bookmarks, .favorites, .profileDirectory]
         let snapshot = dataSource.snapshot()
         for case let .list(list) in snapshot.itemIdentifiers(inSection: .lists) {
             items.append(.list(list))
@@ -104,6 +104,7 @@ class MainSidebarViewController: UIViewController {
         select(item: .tab(.timelines), animated: false)
         
         NotificationCenter.default.addObserver(self, selector: #selector(reloadSavedInstances), name: .savedInstancesChanged, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
         
         mastodonController.$lists
             .sink { [unowned self] in self.reloadLists($0) }
@@ -165,7 +166,7 @@ class MainSidebarViewController: UIViewController {
 
     private func applyInitialSnapshot() {
         var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-        snapshot.appendSections(Section.allCases)
+        snapshot.appendSections(Section.allCases.filter { $0 != .discover })
         snapshot.appendItems([
             .tab(.timelines),
             .tab(.notifications),
@@ -177,14 +178,36 @@ class MainSidebarViewController: UIViewController {
         snapshot.appendItems([
             .tab(.compose)
         ], toSection: .compose)
+        if mastodonController.instanceFeatures.trends,
+           !Preferences.shared.hideDiscover {
+            snapshot.insertSections([.discover], afterSection: .compose)
+        }
         dataSource.apply(snapshot, animatingDifferences: false)
         
+        applyDiscoverSectionSnapshot()
         reloadLists(mastodonController.lists)
         updateHashtagsSection(followed: mastodonController.followedHashtags)
         reloadSavedInstances()
     }
     
+    private func applyDiscoverSectionSnapshot() {
+        var discoverSnapshot = NSDiffableDataSourceSectionSnapshot<Item>()
+        discoverSnapshot.append([.discoverHeader])
+        discoverSnapshot.append([
+            .profileDirectory,
+        ], to: .discoverHeader)
+        dataSource.apply(discoverSnapshot, to: .discover)
+    }
+    
     private func ownInstanceLoaded(_ instance: Instance) {
+        if mastodonController.instanceFeatures.trends {
+            var snapshot = self.dataSource.snapshot()
+            if !snapshot.sectionIdentifiers.contains(.discover) {
+                snapshot.appendSections([.discover])
+                dataSource.apply(snapshot, animatingDifferences: false)
+            }
+            applyDiscoverSectionSnapshot()
+        }
         let prevSelected = collectionView.indexPathsForSelectedItems
         
         if let prevSelected = prevSelected?.first {
@@ -267,6 +290,22 @@ class MainSidebarViewController: UIViewController {
         self.dataSource.apply(instancesSnapshot, to: .savedInstances)
     }
     
+    @objc private func preferencesChanged() {
+        var snapshot = dataSource.snapshot()
+        let hasSection = snapshot.sectionIdentifiers.contains(.discover)
+        let hide = Preferences.shared.hideDiscover
+        if hasSection && hide {
+            snapshot.deleteSections([.discover])
+            dataSource.apply(snapshot)
+        } else if !hasSection && !hide {
+            snapshot.insertSections([.discover], afterSection: .compose)
+            dataSource.apply(snapshot)
+            applyDiscoverSectionSnapshot()
+        } else {
+            return
+        }
+    }
+    
     private func returnToPreviousItem() {
         let item = previouslySelectedItem ?? .tab(.timelines)
         previouslySelectedItem = nil
@@ -339,6 +378,7 @@ extension MainSidebarViewController {
     enum Section: Int, Hashable, CaseIterable {
         case tabs
         case compose
+        case discover
         case lists
         case savedHashtags
         case savedInstances
@@ -346,6 +386,7 @@ extension MainSidebarViewController {
     enum Item: Hashable {
         case tab(MainTabBarViewController.Tab)
         case explore, bookmarks, favorites
+        case discoverHeader, profileDirectory
         case listsHeader, list(List), addList
         case savedHashtagsHeader, savedHashtag(Hashtag), addSavedHashtag
         case savedInstancesHeader, savedInstance(URL), addSavedInstance
@@ -360,6 +401,10 @@ extension MainSidebarViewController {
                 return "Bookmarks"
             case .favorites:
                 return "Favorites"
+            case .discoverHeader:
+                return "Discover"
+            case .profileDirectory:
+                return "Profile Directory"
             case .listsHeader:
                 return "Lists"
             case let .list(list):
@@ -391,13 +436,15 @@ extension MainSidebarViewController {
                 return "bookmark"
             case .favorites:
                 return "star"
+            case .profileDirectory:
+                return "person.2.fill"
             case .list(_):
                 return "list.bullet"
             case .savedHashtag(_):
                 return "number"
             case .savedInstance(_):
                 return "globe"
-            case .listsHeader, .savedHashtagsHeader, .savedInstancesHeader:
+            case .discoverHeader, .listsHeader, .savedHashtagsHeader, .savedInstancesHeader:
                 return nil
             case .addList, .addSavedHashtag, .addSavedInstance:
                 return "plus"
@@ -406,7 +453,7 @@ extension MainSidebarViewController {
         
         var hasChildren: Bool {
             switch self {
-            case .listsHeader, .savedHashtagsHeader, .savedInstancesHeader:
+            case .discoverHeader, .listsHeader, .savedHashtagsHeader, .savedInstancesHeader:
                 return true
             default:
                 return false

Tusker/Screens/Main/MainSplitViewController.swift

@@ -217,7 +217,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             // Make sure viewDidLoad is called so that the searchController/resultsController have been initialized
             explore.loadViewIfNeeded()
             
-            let search = secondaryNavController.viewControllers.first as! InlineTrendsViewController
+            let search = secondaryNavController.viewControllers.first as! SearchViewController
             // Copy the search query from the search VC to the Explore VC's search controller.
             let query = search.searchController.searchBar.text ?? ""
             explore.searchController.searchBar.text = query
@@ -232,7 +232,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             
             tabBarViewController.select(tab: .explore)
             
-        case .bookmarks, .favorites, .list(_), .savedHashtag(_), .savedInstance(_):
+        case .bookmarks, .favorites, .profileDirectory, .list(_), .savedHashtag(_), .savedInstance(_):
             tabBarViewController.select(tab: .explore)
             // Make sure the Explore VC doesn't show its search bar when it appears, in case the user was previously
             // in compact mode and performing a search.
@@ -240,7 +240,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             let explore = exploreNav.viewControllers.first as! ExploreViewController
             explore.searchControllerStatusOnAppearance = false
             
-        case .listsHeader, .addList, .savedHashtagsHeader, .addSavedHashtag, .savedInstancesHeader, .addSavedInstance:
+        case .discoverHeader, .listsHeader, .addList, .savedHashtagsHeader, .addSavedHashtag, .savedInstancesHeader, .addSavedInstance:
             // These items are not selectable in the sidebar collection view, so this code is unreachable.
             fatalError("unexpected selected sidebar item: \(sidebar.selectedItem!)")
         }
@@ -286,7 +286,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                 if tabNavigationStack.count == 1 || ((tabNavigationStack.first as? ExploreViewController)?.searchController?.isActive ?? false) {
                     exploreItem = .explore
                     // reuse the existing VC, if there is one
-                    let searchVC = getOrCreateNavigationStack(item: .explore).first! as! InlineTrendsViewController
+                    let searchVC = getOrCreateNavigationStack(item: .explore).first! as! SearchViewController
                     // load the view so that the search controller is accessible
                     searchVC.loadViewIfNeeded()
                     let explore = tabNavigationStack.first as! ExploreViewController
@@ -317,6 +317,8 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                         exploreItem = .explore
                         // these three VCs are part of the root SearchViewController, so we don't need to transfer them
                         skipFirst = 2
+                    case is ProfileDirectoryViewController:
+                        exploreItem = .profileDirectory
                     default:
                         // transfer the navigation stack prepending, the existing explore VC
                         // if there was other stuff on the explore stack, it will get discarded
@@ -377,18 +379,20 @@ fileprivate extension MainSidebarViewController.Item {
         case let .tab(tab):
             return tab.createViewController(mastodonController)
         case .explore:
-            return InlineTrendsViewController(mastodonController: mastodonController)
+            return SearchViewController(mastodonController: mastodonController)
         case .bookmarks:
             return BookmarksViewController(mastodonController: mastodonController)
         case .favorites:
             return FavoritesViewController(mastodonController: mastodonController)
+        case .profileDirectory:
+            return ProfileDirectoryViewController(mastodonController: mastodonController)
         case let .list(list):
             return ListTimelineViewController(for: list, mastodonController: mastodonController)
         case let .savedHashtag(hashtag):
             return HashtagTimelineViewController(for: hashtag, mastodonController: mastodonController)
         case let .savedInstance(url):
             return InstanceTimelineViewController(for: url, parentMastodonController: mastodonController)
-        case .listsHeader, .addList, .savedHashtagsHeader, .addSavedHashtag, .savedInstancesHeader, .addSavedInstance:
+        case .discoverHeader, .listsHeader, .addList, .savedHashtagsHeader, .addSavedHashtag, .savedInstancesHeader, .addSavedInstance:
             return nil
         }
     }
@@ -478,7 +482,7 @@ extension MainSplitViewController: TuskerRootViewController {
             select(item: .explore)
         }
         
-        guard let searchViewController = secondaryNavController.viewControllers.first as? InlineTrendsViewController else {
+        guard let searchViewController = secondaryNavController.viewControllers.first as? SearchViewController else {
             return
         }
         

Tusker/Screens/Preferences/WellnessPrefsView.swift

@@ -17,7 +17,7 @@ struct WellnessPrefsView: View {
             notificationsMode
             grayscaleImages
             disableInfiniteScrolling
-            hideTrends
+            hideDiscover
         }
         .listStyle(InsetGroupedListStyle())
         .navigationBarTitle(Text("Digital Wellness"))
@@ -57,10 +57,10 @@ struct WellnessPrefsView: View {
         }
     }
     
-    private var hideTrends: some View {
+    private var hideDiscover: some View {
-        Section(footer: Text("Do not show Trends (hashtags, links, posts, suggested accounts) on the Explore screen.")) {
+        Section(footer: Text("Do not show the Discover section (Trends, Profile Directory) of the Explore screen or sidebar.")) {
-            Toggle(isOn: $preferences.hideTrends) {
+            Toggle(isOn: $preferences.hideDiscover) {
-                Text("Hide Trends")
+                Text("Hide Discover Section")
             }
         }
     }

Tusker/Screens/Search/SearchViewController.swift

@@ -1,41 +1,42 @@
 //
-//  TrendsViewController.swift
+//  SearchViewController.swift
 //  Tusker
 //
-//  Created by Shadowfacts on 2/5/23.
+//  Created by Shadowfacts on 6/24/20.
-//  Copyright © 2023 Shadowfacts. All rights reserved.
+//  Copyright © 2020 Shadowfacts. All rights reserved.
 //
 
 import UIKit
 import Pachyderm
 import SafariServices
+import WebURLFoundationExtras
 
-class TrendsViewController: UIViewController, CollectionViewController {
+class SearchViewController: UIViewController, CollectionViewController {
-    
+
-    let mastodonController: MastodonController
+    weak var mastodonController: MastodonController!
     
     var collectionView: UICollectionView!
     private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
     
-    private var loadTask: Task<Void, Never>?
+    var resultsController: SearchResultsViewController!
+    var searchController: UISearchController!
     
-    private var isShowingTrends = false
+    var searchControllerStatusOnAppearance: Bool? = nil
-    private var shouldShowTrends: Bool {
+    
-        mastodonController.instanceFeatures.trends && !Preferences.shared.hideTrends
+    private var loadTask: Task<Void, Never>?
-    }
     
     init(mastodonController: MastodonController) {
         self.mastodonController = mastodonController
         
         super.init(nibName: nil, bundle: nil)
         
-        title = "Trends"
+        title = NSLocalizedString("Explore", comment: "explore tab title")
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -52,9 +53,9 @@ class TrendsViewController: UIViewController, CollectionViewController {
                 let item = NSCollectionLayoutItem(layoutSize: itemSize)
                 let groupSize = NSCollectionLayoutSize(widthDimension: .absolute(250), heightDimension: .estimated(280))
                 let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitems: [item])
-                group.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 8, bottom: 0, trailing: 8)
+                group.edgeSpacing = NSCollectionLayoutEdgeSpacing(leading: .fixed(8), top: nil, trailing: .fixed(8), bottom: nil)
                 let section = NSCollectionLayoutSection(group: group)
-                section.orthogonalScrollingBehavior = .groupPaging
+                section.orthogonalScrollingBehavior = .continuousGroupLeadingBoundary
                 section.boundarySupplementaryItems = [
                     NSCollectionLayoutBoundarySupplementaryItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .estimated(12)), elementKind: UICollectionView.elementKindSectionHeader, alignment: .topLeading)
                 ]
@@ -66,9 +67,9 @@ class TrendsViewController: UIViewController, CollectionViewController {
                 let item = NSCollectionLayoutItem(layoutSize: itemSize)
                 let groupSize = NSCollectionLayoutSize(widthDimension: .absolute(350), heightDimension: .absolute(250))
                 let group = NSCollectionLayoutGroup.horizontal(layoutSize: groupSize, subitems: [item])
-                group.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 8, bottom: 0, trailing: 8)
+                group.edgeSpacing = NSCollectionLayoutEdgeSpacing(leading: .fixed(8), top: nil, trailing: .fixed(8), bottom: nil)
                 let section = NSCollectionLayoutSection(group: group)
-                section.orthogonalScrollingBehavior = .groupPaging
+                section.orthogonalScrollingBehavior = .continuousGroupLeadingBoundary
                 section.boundarySupplementaryItems = [
                     NSCollectionLayoutBoundarySupplementaryItem(layoutSize: NSCollectionLayoutSize(widthDimension: .fractionalWidth(1), heightDimension: .estimated(12)), elementKind: UICollectionView.elementKindSectionHeader, alignment: .topLeading)
                 ]
@@ -91,9 +92,53 @@ class TrendsViewController: UIViewController, CollectionViewController {
         
         dataSource = createDataSource()
         
+        resultsController = SearchResultsViewController(mastodonController: mastodonController)
+        resultsController.exploreNavigationController = self.navigationController
+        searchController = UISearchController(searchResultsController: resultsController)
+        searchController.obscuresBackgroundDuringPresentation = true
+        if #available(iOS 16.0, *) {
+            searchController.scopeBarActivation = .onSearchActivation
+        }
+        searchController.searchBar.autocapitalizationType = .none
+        searchController.searchBar.delegate = resultsController
+        searchController.searchBar.scopeButtonTitles = SearchResultsViewController.Scope.allCases.map(\.title)
+        searchController.hidesNavigationBarDuringPresentation = false
+        definesPresentationContext = true
+        
+        navigationItem.searchController = searchController
+        navigationItem.hidesSearchBarWhenScrolling = false
+        if #available(iOS 16.0, *) {
+            navigationItem.preferredSearchBarPlacement = .stacked
+        }
+        
         NotificationCenter.default.addObserver(self, selector: #selector(preferencesChanged), name: .preferencesChanged, object: nil)
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        clearSelectionOnAppear(animated: animated)
+        
+        loadTask?.cancel()
+        loadTask = Task(priority: .userInitiated) {
+            if (try? await mastodonController.getOwnInstance()) != nil {
+                await applySnapshot()
+            }
+        }
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        // this is a workaround for the issue that setting isActive on a search controller that is not visible
+        // does not cause it to automatically become active once it becomes visible
+        // see FB7814561
+        if let active = searchControllerStatusOnAppearance {
+            searchController.isActive = active
+            searchControllerStatusOnAppearance = nil
+        }
+    }
+    
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
         let sectionHeaderCell = UICollectionView.SupplementaryRegistration<UICollectionViewListCell>(elementKind: UICollectionView.elementKindSectionHeader) { [unowned self] (headerView, collectionView, indexPath) in
             let section = self.dataSource.snapshot().sectionIdentifiers[indexPath.section]
@@ -143,27 +188,10 @@ class TrendsViewController: UIViewController, CollectionViewController {
         return dataSource
     }
     
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        clearSelectionOnAppear(animated: animated)
-        
-        if loadTask == nil {
-            loadTask = Task(priority: .userInitiated) {
-                if (try? await mastodonController.getOwnInstance()) != nil {
-                    await loadTrends()
-                }
-            }
-        }
-    }
-    
     @MainActor
-    private func loadTrends() async {
+    private func applySnapshot() async {
-        guard isShowingTrends != shouldShowTrends else {
+        guard mastodonController.instanceFeatures.trends,
-            return
+              !Preferences.shared.hideDiscover else {
-        }
-        isShowingTrends = shouldShowTrends
-        guard shouldShowTrends else {
             await dataSource.apply(NSDiffableDataSourceSnapshot())
             return
         }
@@ -216,11 +244,9 @@ class TrendsViewController: UIViewController, CollectionViewController {
     }
     
     @objc private func preferencesChanged() {
-        if isShowingTrends != shouldShowTrends {
+        loadTask?.cancel()
-            loadTask?.cancel()
+        loadTask = Task {
-            loadTask = Task {
+            await applySnapshot()
-                await loadTrends()
-            }
         }
     }
     
@@ -247,9 +273,10 @@ class TrendsViewController: UIViewController, CollectionViewController {
             self.showToast(configuration: config, animated: true)
         }
     }
+
 }
 
-extension TrendsViewController {
+extension SearchViewController {
     enum Section {
         case trendingHashtags
         case trendingLinks
@@ -275,7 +302,7 @@ extension TrendsViewController {
         case link(Card)
         case account(String, Suggestion.Source)
         
-        static func == (lhs: Item, rhs: Item) -> Bool {
+        static func == (lhs: SearchViewController.Item, rhs: SearchViewController.Item) -> Bool {
             switch (lhs, rhs) {
             case let (.status(a, _), .status(b, _)):
                 return a == b
@@ -309,7 +336,7 @@ extension TrendsViewController {
     }
 }
 
-extension TrendsViewController: UICollectionViewDelegate {
+extension SearchViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let item = dataSource.itemIdentifier(for: indexPath) else {
             return
@@ -416,7 +443,7 @@ extension TrendsViewController: UICollectionViewDelegate {
     }
 }
 
-extension TrendsViewController: UICollectionViewDragDelegate {
+extension SearchViewController: UICollectionViewDragDelegate {
     func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
         guard let item = dataSource.itemIdentifier(for: indexPath) else {
                   return []
@@ -463,17 +490,17 @@ extension TrendsViewController: UICollectionViewDragDelegate {
     }
 }
 
-extension TrendsViewController: TuskerNavigationDelegate {
+extension SearchViewController: TuskerNavigationDelegate {
     var apiController: MastodonController! { mastodonController }
 }
 
-extension TrendsViewController: ToastableViewController {
+extension SearchViewController: ToastableViewController {
 }
 
-extension TrendsViewController: MenuActionProvider {
+extension SearchViewController: MenuActionProvider {
 }
 
-extension TrendsViewController: StatusCollectionViewCellDelegate {
+extension SearchViewController: StatusCollectionViewCellDelegate {
     func statusCellNeedsReconfigure(_ cell: StatusCollectionViewCell, animated: Bool, completion: (() -> Void)?) {
         if let indexPath = collectionView.indexPath(for: cell) {
             var snapshot = dataSource.snapshot()