Packages/Pachyderm/Sources/Pachyderm/Client.swift

@@ -483,12 +483,6 @@ public class Client {
         ])
     }
     
-    // MARK: - Hashtags
-    /// Requires Mastodon 4.0.0+
-    public static func getHashtag(name: String) -> Request<Hashtag> {
-        return Request(method: .get, path: "/api/v1/tags/\(name)")
-    }
-
 }
 
 extension Client {

Tusker/API/ToggleFollowHashtagService.swift

@@ -12,12 +12,12 @@ import Pachyderm
 @MainActor
 class ToggleFollowHashtagService {
     
-    private let hashtagName: String
+    private let hashtag: Hashtag
     private let mastodonController: MastodonController
     private let presenter: any TuskerNavigationDelegate
     
-    init(hashtagName: String, presenter: any TuskerNavigationDelegate) {
+    init(hashtag: Hashtag, presenter: any TuskerNavigationDelegate) {
-        self.hashtagName = hashtagName
+        self.hashtag = hashtag
         self.mastodonController = presenter.apiController
         self.presenter = presenter
     }
@@ -25,9 +25,9 @@ class ToggleFollowHashtagService {
     func toggleFollow() async {
         let context = mastodonController.persistentContainer.viewContext
         var config: ToastConfiguration
-        if let existing = mastodonController.followedHashtags.first(where: { $0.name == hashtagName }) {
+        if let existing = mastodonController.followedHashtags.first(where: { $0.name == hashtag.name }) {
             do {
-                let req = Hashtag.unfollow(name: hashtagName)
+                let req = Hashtag.unfollow(name: hashtag.name)
                 _ = try await mastodonController.run(req)
                 
                 context.delete(existing)
@@ -44,7 +44,7 @@ class ToggleFollowHashtagService {
             }
         } else {
             do {
-                let req = Hashtag.follow(name: hashtagName)
+                let req = Hashtag.follow(name: hashtag.name)
                 let (hashtag, _) = try await mastodonController.run(req)
                 
                 _ = FollowedHashtag(hashtag: hashtag, context: context)

Tusker/Scenes/AuxiliarySceneDelegate.swift

@@ -106,9 +106,7 @@ class AuxiliarySceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDel
     
     private func timelineViewController(for timeline: Timeline, mastodonController: MastodonController) -> UIViewController {
         switch timeline {
-        case .tag(hashtag: let name):
+        // todo: hashtag controllers need whole objects which must be fetched asynchronously, and that endpoint only exists in mastodon v4
-            return HashtagTimelineViewController(forNamed: name, mastodonController: mastodonController)
-        
         case .list(id: let id):
             let req = ListMO.fetchRequest(id: id)
             if let list = try? mastodonController.persistentContainer.viewContext.fetch(req).first {

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -127,11 +127,6 @@ class MainSidebarViewController: UIViewController {
         itemLastSelectedTimestamps[item] = Date()
     }
     
-    func hasItem(_ item: Item) -> Bool {
-        loadViewIfNeeded()
-        return dataSource.snapshot().itemIdentifiers.contains(item)
-    }
-    
     private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
         let listCell = UICollectionView.CellRegistration<UICollectionViewListCell, Item> { (cell, indexPath, item) in
             var config = cell.defaultContentConfiguration()
@@ -217,10 +212,10 @@ class MainSidebarViewController: UIViewController {
         let req = SavedHashtag.fetchRequest(account: mastodonController.accountInfo!)
         let saved = (try? mastodonController.persistentContainer.viewContext.fetch(req)) ?? []
         var items = saved.map {
-            Item.savedHashtag($0.name)
+            Item.savedHashtag(Hashtag(name: $0.name, url: $0.url))
         }
         for followed in followed where !saved.contains(where: { $0.name == followed.name }) {
-            items.append(.savedHashtag(followed.name))
+            items.append(.savedHashtag(Hashtag(name: followed.name, url: followed.url)))
         }
         items = items.uniques()
         items.sort(using: SemiCaseSensitiveComparator.keyPath(\.title))
@@ -320,8 +315,8 @@ class MainSidebarViewController: UIViewController {
             return UserActivityManager.myProfileActivity(accountID: id)
         case let .list(list):
             return UserActivityManager.showTimelineActivity(timeline: .list(id: list.id), accountID: id)
-        case let .savedHashtag(name):
+        case let .savedHashtag(tag):
-            return UserActivityManager.showTimelineActivity(timeline: .tag(hashtag: name), accountID: id)
+            return UserActivityManager.showTimelineActivity(timeline: .tag(hashtag: tag.name), accountID: id)
         case .savedInstance(_):
             // todo: show timeline activity doesn't work for public timelines
             return nil
@@ -352,7 +347,7 @@ extension MainSidebarViewController {
         case tab(MainTabBarViewController.Tab)
         case explore, bookmarks, favorites
         case listsHeader, list(List), addList
-        case savedHashtagsHeader, savedHashtag(String), addSavedHashtag
+        case savedHashtagsHeader, savedHashtag(Hashtag), addSavedHashtag
         case savedInstancesHeader, savedInstance(URL), addSavedInstance
         
         var title: String {
@@ -373,8 +368,8 @@ extension MainSidebarViewController {
                 return "New List..."
             case .savedHashtagsHeader:
                 return "Hashtags"
-            case let .savedHashtag(name):
+            case let .savedHashtag(hashtag):
-                return name
+                return hashtag.name
             case .addSavedHashtag:
                 return "Add Hashtag..."
             case .savedInstancesHeader:

Tusker/Screens/Main/MainSplitViewController.swift

@@ -339,8 +339,8 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                         exploreItem = .favorites
                     case let listVC as ListTimelineViewController:
                         exploreItem = .list(listVC.list)
-                    case let hashtagVC as HashtagTimelineViewController where sidebar.hasItem(.savedHashtag(hashtagVC.hashtagName)):
+                    case let hashtagVC as HashtagTimelineViewController where hashtagVC.isHashtagSaved:
-                        exploreItem = .savedHashtag(hashtagVC.hashtagName)
+                        exploreItem = .savedHashtag(hashtagVC.hashtag)
                     case let instanceVC as InstanceTimelineViewController:
                         exploreItem = .savedInstance(instanceVC.instanceURL)
                     case is TrendsViewController:
@@ -428,8 +428,8 @@ fileprivate extension MainSidebarViewController.Item {
             return FavoritesViewController(mastodonController: mastodonController)
         case let .list(list):
             return ListTimelineViewController(for: list, mastodonController: mastodonController)
-        case let .savedHashtag(name):
+        case let .savedHashtag(hashtag):
-            return HashtagTimelineViewController(forNamed: name, mastodonController: mastodonController)
+            return HashtagTimelineViewController(for: hashtag, mastodonController: mastodonController)
         case let .savedInstance(url):
             return InstanceTimelineViewController(for: url, parentMastodonController: mastodonController)
         case .listsHeader, .addList, .savedHashtagsHeader, .addSavedHashtag, .savedInstancesHeader, .addSavedInstance:

Tusker/Screens/Timeline/HashtagTimelineViewController.swift

@@ -11,30 +11,23 @@ import Pachyderm
 
 class HashtagTimelineViewController: TimelineViewController {
 
-    let hashtagName: String
+    let hashtag: Hashtag
-    private var hashtag: Hashtag?
-    private var fetchHashtag: Task<Hashtag?, Never>?
     
     var toggleSaveButton: UIBarButtonItem!
     
     var isHashtagSaved: Bool {
-        let req = SavedHashtag.fetchRequest(name: hashtagName, account: mastodonController.accountInfo!)
+        let req = SavedHashtag.fetchRequest(name: hashtag.name, account: mastodonController.accountInfo!)
         return mastodonController.persistentContainer.viewContext.objectExists(for: req)
     }
     
     private var isHashtagFollowed: Bool {
-        mastodonController.followedHashtags.contains(where: { $0.name == hashtagName })
+        mastodonController.followedHashtags.contains(where: { $0.name == hashtag.name })
     }
     
-    convenience init(for hashtag: Hashtag, mastodonController: MastodonController) {
+    init(for hashtag: Hashtag, mastodonController: MastodonController) {
-        self.init(forNamed: hashtag.name, mastodonController: mastodonController)
         self.hashtag = hashtag
-    }
         
-    init(forNamed name: String, mastodonController: MastodonController) {
+        super.init(for: .tag(hashtag: hashtag.name), mastodonController: mastodonController)
-        self.hashtagName = name
-        
-        super.init(for: .tag(hashtag: hashtagName), mastodonController: mastodonController)
     }
     
     required init?(coder aDecoder: NSCoder) {
@@ -44,37 +37,10 @@ class HashtagTimelineViewController: TimelineViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if hashtag == nil {
-            fetchHashtag = Task {
-                let name = hashtagName.lowercased()
-                let hashtag: Hashtag?
-                if mastodonController.instanceFeatures.hasMastodonVersion(4, 0, 0) {
-                    let req = Client.getHashtag(name: name)
-                    hashtag = try? await mastodonController.run(req).0
-                } else {
-                    let req = Client.search(query: "#\(name)", types: [.hashtags])
-                    let results = try? await mastodonController.run(req).0
-                    hashtag = results?.hashtags.first(where: { $0.name.lowercased() == name })
-                }
-                self.hashtag = hashtag
-                return hashtag
-            }
-        }
-
         let menu = UIMenu(children: [
             // uncached so that the saved/followed updates every time
             UIDeferredMenuElement.uncached({ [unowned self] elementHandler in
-                if let hashtag = self.hashtag {
+                elementHandler(actionsForHashtag(hashtag, source: .barButtonItem(self.navigationItem.rightBarButtonItem!)))
-                    elementHandler(actionsForHashtag(hashtag, source: .barButtonItem(self.navigationItem.rightBarButtonItem!)))
-                } else {
-                    Task {
-                        if let hashtag = await fetchHashtag?.value {
-                            elementHandler(actionsForHashtag(hashtag, source: .barButtonItem(self.navigationItem.rightBarButtonItem!)))
-                        } else {
-                            elementHandler([])
-                        }
-                    }
-                }
             })
         ])
         navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis"), menu: menu)
@@ -82,28 +48,17 @@ class HashtagTimelineViewController: TimelineViewController {
     
     private func toggleSave() {
         let context = mastodonController.persistentContainer.viewContext
-        if let existing = try? context.fetch(SavedHashtag.fetchRequest(name: hashtagName, account: mastodonController.accountInfo!)).first {
+        if let existing = try? context.fetch(SavedHashtag.fetchRequest(name: hashtag.name, account: mastodonController.accountInfo!)).first {
             context.delete(existing)
-            mastodonController.persistentContainer.save(context: context)
         } else {
-            Task { @MainActor in
+            _ = SavedHashtag(hashtag: hashtag, account: mastodonController.accountInfo!, context: context)
-                let hashtag: Hashtag?
-                if let tag = self.hashtag {
-                    hashtag = tag
-                } else {
-                    hashtag = await fetchHashtag?.value
-                }
-                if let hashtag {
-                    _ = SavedHashtag(hashtag: hashtag, account: mastodonController.accountInfo!, context: context)
-                    mastodonController.persistentContainer.save(context: context)
-                }
-            }
         }
+        mastodonController.persistentContainer.save(context: context)
     }
     
     private func toggleFollow() {
         Task {
-            await ToggleFollowHashtagService(hashtagName: hashtagName, presenter: self).toggleFollow()
+            await ToggleFollowHashtagService(hashtag: hashtag, presenter: self).toggleFollow()
         }
     }
 

Tusker/Screens/Utilities/Previewing.swift

@@ -133,7 +133,7 @@ extension MenuActionProvider {
             let name = hashtag.name.lowercased()
             let context = mastodonController.persistentContainer.viewContext
             let existing = try? context.fetch(SavedHashtag.fetchRequest(name: name, account: mastodonController.accountInfo!)).first
-            let saveSubtitle = "Shown in the Explore section of Tusker"
+            let saveSubtitle = "Saved hashtags appear in the Explore section of Tusker"
             let saveImage = UIImage(systemName: existing != nil ? "minus" : "plus")
             actionsSection = [
                 UIAction(title: existing != nil ? "Unsave Hashtag" : "Save Hashtag", subtitle: saveSubtitle, image: saveImage, handler: { (_) in
@@ -147,11 +147,11 @@ extension MenuActionProvider {
             ]
             if mastodonController.instanceFeatures.canFollowHashtags {
                 let existing = mastodonController.followedHashtags.first(where: { $0.name.lowercased() == name })
-                let subtitle = "Posts appear in your Home timeline"
+                let subtitle = "Posts tagged with followed hashtags appear in your Home timeline"
                 let image = UIImage(systemName: existing != nil ? "person.badge.minus" : "person.badge.plus")
                 actionsSection.append(UIAction(title: existing != nil ? "Unfollow" : "Follow", subtitle: subtitle, image: image) { [unowned self] _ in
                     Task {
-                        await ToggleFollowHashtagService(hashtagName: hashtag.name, presenter: navigationDelegate!).toggleFollow()
+                        await ToggleFollowHashtagService(hashtag: hashtag, presenter: navigationDelegate!).toggleFollow()
                     }
                 })
             }