Minor cleanup (IOS-186)

mastodon · Nov 10, 2023 · 580c931 · 580c931
1 parent 8956d79
commit 580c931
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewController.swift b/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewController.swift
@@ -5,9 +5,7 @@
 //  Created by Marcus Kida on 22.11.22.
 //
 
-import os
 import UIKit
-import Combine
 import MastodonAsset
 import MastodonCore
 import MastodonUI
@@ -42,14 +40,11 @@ final class FollowedTagsViewController: UIViewController, NeedsDependency {
 
         super.init(nibName: nil, bundle: nil)
 
-        let title = L10n.Scene.FollowedTags.title
-        self.title = title
+        title = L10n.Scene.FollowedTags.title
 
         view.backgroundColor = .secondarySystemBackground
-
         view.addSubview(tableView)
         tableView.pinToParent()
-
         tableView.delegate = self
 
         refreshControl.addTarget(self, action: #selector(FollowedTagsViewController.refresh(_:)), for: .valueChanged)

diff --git a/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewModel+DiffableDataSource.swift b/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewModel+DiffableDataSource.swift
@@ -6,7 +6,6 @@
 //
 
 import UIKit
-import Combine
 import MastodonSDK
 import MastodonCore
 

diff --git a/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewModel.swift b/Mastodon/Scene/Profile/FollowedTags/FollowedTagsViewModel.swift
@@ -5,14 +5,11 @@
 //  Created by Marcus Kida on 23.11.22.
 //
 
-import os
 import UIKit
-import Combine
 import MastodonSDK
 import MastodonCore
 
 final class FollowedTagsViewModel: NSObject {
-    var disposeBag = Set<AnyCancellable>()
     private(set) var followedTags: [Mastodon.Entity.Tag]
 
     private weak var tableView: UITableView?
@@ -21,10 +18,7 @@ final class FollowedTagsViewModel: NSObject {
     // input
     let context: AppContext
     let authContext: AuthContext
-
-    // output
-    let presentHashtagTimeline = PassthroughSubject<HashtagTimelineViewModel, Never>()
-
+
     init(context: AppContext, authContext: AuthContext) {
         self.context = context
         self.authContext = authContext
@@ -43,18 +37,20 @@ extension FollowedTagsViewModel {
 
     func fetchFollowedTags(completion: (() -> Void)? = nil ) {
         Task { @MainActor in
-            followedTags = try await context.apiService.getFollowedTags(
-                domain: authContext.mastodonAuthenticationBox.domain,
-                query: Mastodon.API.Account.FollowedTagsQuery(limit: nil),
-                authenticationBox: authContext.mastodonAuthenticationBox
-            ).value
+            do {
+                followedTags = try await context.apiService.getFollowedTags(
+                    domain: authContext.mastodonAuthenticationBox.domain,
+                    query: Mastodon.API.Account.FollowedTagsQuery(limit: nil),
+                    authenticationBox: authContext.mastodonAuthenticationBox
+                ).value
 
-            var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-            snapshot.appendSections([.main])
-            let items = followedTags.compactMap { Item.hashtag($0) }
-            snapshot.appendItems(items, toSection: .main)
+                var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+                snapshot.appendSections([.main])
+                let items = followedTags.compactMap { Item.hashtag($0) }
+                snapshot.appendItems(items, toSection: .main)
 
-            await diffableDataSource?.apply(snapshot)
+                await diffableDataSource?.apply(snapshot)
+            } catch {}
 
             completion?()
         }