Address PR Feedback (IOS-176)

Mastodon/Coordinator/SceneCoordinator.swift

@@ -569,7 +569,10 @@ public extension SceneCoordinator {
     @MainActor
     func showLoading(on viewController: UIViewController?) {
         guard let viewController else { return }
-
+        
+        /// Don't add HUD twice
+        guard MBProgressHUD.forView(viewController.view) == nil else { return }
+        
         MBProgressHUD.showAdded(to: viewController.view, animated: true)
     }
 

Mastodon/Protocol/Provider/DataSourceFacade+Meta.swift

@@ -50,7 +50,6 @@ extension DataSourceFacade {
 
             await responseToURLAction(
                 provider: provider,
-                status: status,
                 url: url
             )
         case .hashtag(_, let hashtag, _):

Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift

@@ -12,19 +12,21 @@ import MastodonSDK
 
 extension DataSourceFacade {
     
+    @MainActor
     static func coordinateToProfileScene(
         provider: DataSourceProvider & AuthContextProvider,
         target: StatusTarget,
         status: MastodonStatus
     ) async {
-        let acct: String = {
+        let acct: String
-            switch target {
+        switch target {
-            case .status:
+        case .status:
-                return status.reblog?.entity.account.acct ?? status.entity.account.acct
+            acct = status.reblog?.entity.account.acct ?? status.entity.account.acct
-            case .reblog:
+        case .reblog:
-                return status.entity.account.acct
+            acct = status.entity.account.acct
-            }
+        }
-        }()
+        
+        provider.coordinator.showLoading()
         
         let _redirectRecord = try? await Mastodon.API.Account.lookupAccount(
             session: .shared,
@@ -35,6 +37,7 @@ extension DataSourceFacade {
                 
         guard let redirectRecord = _redirectRecord else {
             assertionFailure()
+            provider.coordinator.hideLoading()
             return
         }
         await coordinateToProfileScene(
@@ -110,12 +113,9 @@ extension DataSourceFacade {
             return
         }
     
-        let managedObjectContext = provider.context.managedObjectContext
+        let mentions = status.entity.mentions ?? []
-        let mentions = try? await managedObjectContext.perform {
-            return status.entity.mentions ?? []
-        }
         
-        guard let mention = mentions?.first(where: { $0.url == href }) else {
+        guard let mention = mentions.first(where: { $0.url == href }) else {
             _  = provider.coordinator.present(
                 scene: .safari(url: url),
                 from: provider,

Mastodon/Protocol/Provider/DataSourceFacade+URL.swift

@@ -14,7 +14,6 @@ import MastodonSDK
 extension DataSourceFacade {
     static func responseToURLAction(
         provider: DataSourceProvider & AuthContextProvider,
-        status: MastodonStatus,
         url: URL
     ) async {
         let domain = provider.authContext.mastodonAuthenticationBox.domain

Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift

@@ -182,9 +182,15 @@ extension NotificationTableViewCellDelegate where Self: DataSourceProvider & Med
             
             let _mediaTransitionContext: NotificationMediaTransitionContext? = {
                 guard let status = record.status?.reblog ?? record.status else { return nil }
+                let needsToBeToggled: Bool = {
+                    guard let sensitive = status.entity.sensitive else {
+                        return false
+                    }
+                    return status.isSensitiveToggled ? !sensitive : sensitive
+                }()
                 return NotificationMediaTransitionContext(
                     status: status,
-                    needsToggleMediaSensitive: status.isSensitiveToggled ? !(status.entity.sensitive == true) : (status.entity.sensitive == true)
+                    needsToggleMediaSensitive: needsToBeToggled
                 )
             }()
 

Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift

@@ -148,7 +148,6 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte
 
             await DataSourceFacade.responseToURLAction(
                 provider: self,
-                status: status,
                 url: url
             )
         }
@@ -173,7 +172,6 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte
 
             await DataSourceFacade.responseToURLAction(
                 provider: self,
-                status: status,
                 url: url
             )
         }

Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewControllerNavigateable.swift

@@ -65,10 +65,7 @@ extension StatusTableViewControllerNavigateableCore where Self: DataSourceProvid
         case .status(let record):
             return record
         case .notification(let record):
-            guard let statusRecord = record.status else {
+            return record.status
-                return nil
-            }
-            return statusRecord
         default:
             return nil
         }

Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift

@@ -40,9 +40,7 @@ extension UITableViewDelegate where Self: DataSourceProvider & AuthContextProvid
                     provider: self,
                     tag: tag
                 )
-            case .notification(let notification):
+            case .notification(let notification):                
-                let managedObjectContext = context.managedObjectContext
-                
                 let _status: MastodonStatus? = notification.status
                 if let status = _status {
                     await DataSourceFacade.coordinateToStatusThreadScene(

Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DataSourceProvider.swift

@@ -22,15 +22,12 @@ extension HomeTimelineViewController: DataSourceProvider {
         
         switch item {
         case .feed(let feed):
-            let item: DataSourceItem? = {
+            guard feed.kind == .home else { return nil }
-                guard feed.kind == .home else { return nil }
+            if let status = feed.status {
-                if let status = feed.status {
+                return .status(record: status)
-                    return .status(record: status)
+            } else {
-                } else {
+                return nil
-                    return nil
+            }
-                }
-            }()
-            return item
         default:
             return nil
         }

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadOldestState.swift

@@ -52,10 +52,7 @@ extension HomeTimelineViewModel.LoadOldestState {
             }
             
             Task {
-                let _maxID: Mastodon.Entity.Status.ID? = {
+                let _maxID = lastFeedRecord.status?.id
-                    guard let status = lastFeedRecord.status else { return nil }
-                    return status.id
-                }()
                 
                 guard let maxID = _maxID else {
                     await self.enter(state: Fail.self)

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift

@@ -42,7 +42,7 @@ extension NotificationTimelineViewController: DataSourceProvider {
     }
     
     func delete(status: MastodonStatus) {
-        viewModel.feedFetchedResultsController
+        viewModel.feedFetchedResultsController.delete(status: status)
     }
     
     @MainActor

Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift

@@ -111,18 +111,6 @@ extension NotificationTimelineViewModel {
     
     // load timeline gap
     func loadMore(item: NotificationItem) async {
-//        guard case let .feedLoader(record) = item else { return }
-
-//        guard let maxID = record.notification?.id else { return }
-
-//        // fetch data
-//        if let notifications = try? await context.apiService.notifications(
-//            maxID: maxID,
-//            scope: scope,
-//            authenticationBox: authContext.mastodonAuthenticationBox
-//        ) {
-//            self.feedFetchedResultsController.records += notifications.value.map { MastodonFeed.fromNotification($0, kind: record.kind) }
-//        }
         switch scope {
         case .everything:
             feedFetchedResultsController.loadNext(kind: .notificationAll)

Mastodon/Scene/Report/Share/Cell/ReportStatusTableViewCell+ViewModel.swift

@@ -9,6 +9,7 @@ import UIKit
 import MastodonSDK
 
 extension ReportStatusTableViewCell {
+    // todo: refactor / remove this
     final class ViewModel {
         let value: MastodonStatus
 

MastodonSDK/Sources/MastodonCore/Model/UserIdentifier.swift

@@ -13,6 +13,12 @@ public protocol UserIdentifier {
     var userID: Mastodon.Entity.Account.ID { get }
 }
 
+public extension UserIdentifier {
+    var uniqueUserDomainIdentifier: String {
+        "\(userID)@\(domain)"
+    }
+}
+
 public struct MastodonUserIdentifier: UserIdentifier {
     public let domain: String
     public var userID: Mastodon.Entity.Account.ID

MastodonSDK/Sources/MastodonCore/Persistence/Persistence.swift

@@ -14,20 +14,16 @@ public enum Persistence {
     case notificationsMentions(UserIdentifier)
     case notificationsAll(UserIdentifier)
     
-    private func uniqueUserDomainIdentifier(for userIdentifier: UserIdentifier) -> String {
-        "\(userIdentifier.userID)@\(userIdentifier.domain)"
-    }
-
     private var filename: String {
         switch self {
             case .searchHistory:
                 return "search_history" // todo: @zeitschlag should this be user-scoped as well?
             case let .homeTimeline(userIdentifier):
-            return "home_timeline_\(uniqueUserDomainIdentifier(for: userIdentifier))"
+                return "home_timeline_\(userIdentifier.uniqueUserDomainIdentifier)"
             case let .notificationsMentions(userIdentifier):
-                return "notifications_mentions_\(uniqueUserDomainIdentifier(for: userIdentifier))"
+                return "notifications_mentions_\(userIdentifier.uniqueUserDomainIdentifier)"
             case let .notificationsAll(userIdentifier):
-                return "notifications_all_\(uniqueUserDomainIdentifier(for: userIdentifier))"
+                return "notifications_all_\(userIdentifier.uniqueUserDomainIdentifier)"
         }
     }
 

MastodonSDK/Sources/MastodonCore/Service/API/APIService+HashtagTimeline.swift

@@ -50,8 +50,8 @@ extension APIService {
            for entity in response.value {
                guard let poll = entity.poll else { continue }
                _ = Persistence.Poll.createOrMerge(
-                in: managedObjectContext,
+                  in: managedObjectContext,
-                context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
+                  context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
                )
            }
         }

MastodonSDK/Sources/MastodonCore/Service/API/APIService+HomeTimeline.swift

@@ -49,8 +49,8 @@ extension APIService {
            for entity in response.value {
                guard let poll = entity.poll else { continue }
                _ = Persistence.Poll.createOrMerge(
-                in: managedObjectContext,
+                  in: managedObjectContext,
-                context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
+                  context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
                )
            }
         }

MastodonSDK/Sources/MastodonCore/Service/API/APIService+PublicTimeline.swift

@@ -35,8 +35,8 @@ extension APIService {
            for entity in response.value {
                guard let poll = entity.poll else { continue }
                _ = Persistence.Poll.createOrMerge(
-                in: managedObjectContext,
+                  in: managedObjectContext,
-                context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
+                  context: .init(domain: domain, entity: poll, me: me, networkDate: response.networkDate)
                )
            }
         }

MastodonSDK/Sources/MastodonUI/View/Content/StatusCardControl.swift

@@ -344,9 +344,12 @@ private extension Mastodon.Entity.Card {
         if !aspectRatio.isFinite {
             aspectRatio = 1
         }
-        return (abs(aspectRatio - 1) < 0.05 || image == nil) && html == nil
+        
-        ? .compact
+        if (abs(aspectRatio - 1) < 0.05 || image == nil) && html == nil {
-        : .large(aspectRatio: aspectRatio)
+            return .compact
+        } else {
+            return .large(aspectRatio: aspectRatio)
+        }
     }
 }
 

MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift

@@ -193,7 +193,6 @@ extension StatusView {
                             }
                             .store(in: &disposeBag)
                     }   // end if let
-//                }   // end else B2.
             }   // end else B.
             
         } else {
@@ -389,14 +388,17 @@ extension StatusView {
 
     private func configurePoll(status: MastodonStatus) {
         let status = status.reblog ?? status
-
+        
-        let predicate = Poll.predicate(domain: viewModel.authContext?.mastodonAuthenticationBox.domain ?? "", id: status.entity.poll?.id ?? "")
-
         guard
             let context = viewModel.context?.managedObjectContext,
-            let poll = Poll.findOrFetch(in: context, matching: predicate)
+            let domain = viewModel.authContext?.mastodonAuthenticationBox.domain,
-        else { return }
+            let pollId = status.entity.poll?.id
-        
+        else {
+            return
+        }
+
+        let predicate = Poll.predicate(domain: domain, id: pollId)
+        guard let poll = Poll.findOrFetch(in: context, matching: predicate) else { return }
         
         viewModel.managedObjects.insert(poll)