Tusker.xcodeproj/project.pbxproj

@@ -36,7 +36,6 @@
 		D60E2F2E244248BF005F8713 /* MastodonCachePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */; };
 		D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */; };
 		D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */; };
-		D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */; };
 		D61A45E628DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */; };
 		D61A45E828DF477D002BE511 /* LoadingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */; };
 		D61A45EA28DF51EE002BE511 /* TimelineLikeCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */; };
@@ -96,7 +95,7 @@
 		D630C3CA2BC59FF500208903 /* MastodonController+Push.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3C92BC59FF500208903 /* MastodonController+Push.swift */; };
 		D630C3CC2BC5FD4600208903 /* GetAuthorizationTokenService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3CB2BC5FD4600208903 /* GetAuthorizationTokenService.swift */; };
 		D630C3D42BC61B6100208903 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D630C3D32BC61B6100208903 /* NotificationService.swift */; };
-		D630C3D82BC61B6100208903 /* NotificationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D630C3D12BC61B6000208903 /* NotificationExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		D630C3D82BC61B6100208903 /* NotificationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D630C3D12BC61B6000208903 /* NotificationExtension.appex */; platformFilters = (ios, maccatalyst, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		D630C3DF2BC61C4900208903 /* PushNotifications in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3DE2BC61C4900208903 /* PushNotifications */; };
 		D630C3E12BC61C6700208903 /* UserAccounts in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3E02BC61C6700208903 /* UserAccounts */; };
 		D630C3E52BC6313400208903 /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D630C3E42BC6313400208903 /* Pachyderm */; };
@@ -468,7 +467,6 @@
 		D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonCachePersistentStore.swift; sourceTree = "<group>"; };
 		D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusesViewController.swift; sourceTree = "<group>"; };
 		D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinksViewController.swift; sourceTree = "<group>"; };
-		D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowRequestNotificationViewController.swift; sourceTree = "<group>"; };
 		D61A45E528DC0F2F002BE511 /* ConfirmLoadMoreCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmLoadMoreCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E728DF477D002BE511 /* LoadingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingCollectionViewCell.swift; sourceTree = "<group>"; };
 		D61A45E928DF51EE002BE511 /* TimelineLikeCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineLikeCollectionViewController.swift; sourceTree = "<group>"; };
@@ -1166,7 +1164,6 @@
 				D646DCD92A081A2C0059ECEB /* PollFinishedNotificationCollectionViewCell.swift */,
 				D646DCDB2A081CF10059ECEB /* StatusUpdatedNotificationCollectionViewCell.swift */,
 				D68245112BCA1F4000AFB38B /* NotificationLoadingViewController.swift */,
-				D6187BEC2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift */,
 			);
 			path = Notifications;
 			sourceTree = "<group>";
@@ -2237,7 +2234,6 @@
 				D65A261D2BC39399005EB5D8 /* PushInstanceSettingsView.swift in Sources */,
 				D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */,
 				D61DC84D28F500D200B82C6E /* ProfileViewController.swift in Sources */,
-				D6187BED2BFA840B00B3A281 /* FollowRequestNotificationViewController.swift in Sources */,
 				D600891F29848DE2005B4D00 /* AddInstancePinnedTimelineView.swift in Sources */,
 				D693A72F25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift in Sources */,
 				D627943223A5466600D38C68 /* SelectableTableViewCell.swift in Sources */,

Tusker/Screens/Gallery/ImageGalleryDataSource.swift

@@ -42,7 +42,7 @@ class ImageGalleryDataSource: GalleryDataSource {
                 gifController: gifController
             )
         } else {
-            return LoadingGalleryContentViewController(caption: nil) {
+            return LoadingGalleryContentViewController {
                 let (data, image) = await self.cache.get(self.url, loadOriginal: true)
                 if let image {
                     let gifController: GIFController? =

Tusker/Screens/Gallery/LoadingGalleryContentViewController.swift

@@ -10,7 +10,6 @@ import UIKit
 import GalleryVC
 
 class LoadingGalleryContentViewController: UIViewController, GalleryContentViewController {
-    private let fallbackCaption: String?
     private let provider: () async -> (any GalleryContentViewController)?
     private var wrapped: (any GalleryContentViewController)!
     
@@ -25,15 +24,14 @@ class LoadingGalleryContentViewController: UIViewController, GalleryContentViewC
     }
     
     var caption: String? {
-        wrapped?.caption ?? fallbackCaption
+        wrapped?.caption
     }
     
     var canAnimateFromSourceView: Bool {
         wrapped?.canAnimateFromSourceView ?? true
     }
     
-    init(caption: String?, provider: @escaping () async -> (any GalleryContentViewController)?) {
+    init(provider: @escaping () async -> (any GalleryContentViewController)?) {
-        self.fallbackCaption = caption
         self.provider = provider
         
         super.init(nibName: nil, bundle: nil)

Tusker/Screens/Gallery/StatusAttachmentsGalleryDataSource.swift

@@ -57,8 +57,7 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
                     gifController: gifController
                 )
             } else {
-                return LoadingGalleryContentViewController(caption: attachment.description) {
+                return LoadingGalleryContentViewController {
-                    try! await Task.sleep(nanoseconds: NSEC_PER_SEC)
                     let (data, image) = await ImageCache.attachments.get(attachment.url, loadOriginal: true)
                     if let image {
                         let gifController: GIFController? =
@@ -96,7 +95,7 @@ class StatusAttachmentsGalleryDataSource: GalleryDataSource {
             // TODO: use separate content VC with audio visualization?
             return VideoGalleryContentViewController(url: attachment.url, caption: attachment.description)
         case .unknown:
-            return LoadingGalleryContentViewController(caption: nil) {
+            return LoadingGalleryContentViewController {
                 do {
                     let (data, _) = try await URLSession.shared.data(from: attachment.url)
                     let url = FileManager.default.temporaryDirectory.appendingPathComponent(attachment.url.lastPathComponent)

Tusker/Screens/Notifications/FollowRequestNotificationViewController.swift

@@ -1,144 +0,0 @@
-//
-//  FollowRequestNotificationViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 5/19/24.
-//  Copyright © 2024 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-class FollowRequestNotificationViewController: UIViewController, CollectionViewController {
-    
-    private let mastodonController: MastodonController
-    private let notification: Pachyderm.Notification
-    
-    var collectionView: UICollectionView! {
-        view as? UICollectionView
-    }
-    private var dataSource: UICollectionViewDiffableDataSource<Section, Item>!
-    
-    init(notification: Pachyderm.Notification, mastodonController: MastodonController) {
-        precondition(notification.kind == .followRequest)
-        self.mastodonController = mastodonController
-        self.notification = notification
-        
-        super.init(nibName: nil, bundle: nil)
-        
-        title = "Follow Request"
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func loadView() {
-        let layout = UICollectionViewCompositionalLayout { sectionIndex, environment in
-            var config = UICollectionLayoutListConfiguration(appearance: .grouped)
-            config.backgroundColor = .appGroupedBackground
-            let section = NSCollectionLayoutSection.list(using: config, layoutEnvironment: environment)
-            section.readableContentInset(in: environment)
-            return section
-        }
-        view = UICollectionView(frame: .zero, collectionViewLayout: layout)
-        collectionView.delegate = self
-        collectionView.dragDelegate = self
-        collectionView.allowsFocus = true
-        dataSource = createDataSource()
-    }
-    
-    private func createDataSource() -> UICollectionViewDiffableDataSource<Section, Item> {
-        let followRequestCell = UICollectionView.CellRegistration<FollowRequestNotificationCollectionViewCell, Void> { [unowned self] cell, indexPath, itemIdentifier in
-            cell.delegate = self
-            cell.updateUI(notification: self.notification)
-        }
-        return UICollectionViewDiffableDataSource(collectionView: collectionView) { collectionView, indexPath, itemIdentifier in
-            return collectionView.dequeueConfiguredReusableCell(using: followRequestCell, for: indexPath, item: ())
-        }
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
-        snapshot.appendSections([.notifications])
-        snapshot.appendItems([.notification])
-        dataSource.apply(snapshot, animatingDifferences: false)
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        clearSelectionOnAppear(animated: animated)
-    }
-}
-
-extension FollowRequestNotificationViewController {
-    enum Section {
-        case notifications
-    }
-    enum Item {
-        case notification
-    }
-}
-
-extension FollowRequestNotificationViewController: UICollectionViewDelegate {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        selected(account: notification.account.id)
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-        guard let cell = collectionView.cellForItem(at: indexPath) else {
-            return nil
-        }
-        let accountID = notification.account.id
-        return UIContextMenuConfiguration {
-            ProfileViewController(accountID: accountID, mastodonController: self.mastodonController)
-        } actionProvider: { _ in
-            let cell = cell as! FollowRequestNotificationCollectionViewCell
-            let acceptRejectChildren = [
-                UIAction(title: "Accept", image: UIImage(systemName: "checkmark.circle"), handler: { _ in cell.acceptButtonPressed() }),
-                UIAction(title: "Reject", image: UIImage(systemName: "xmark.circle"), handler: { _ in cell.rejectButtonPressed() }),
-            ]
-            let acceptRejectMenu: UIMenu
-            if #available(iOS 16.0, *) {
-                acceptRejectMenu = UIMenu(options: .displayInline, preferredElementSize: .medium, children: acceptRejectChildren)
-            } else {
-                acceptRejectMenu = UIMenu(options: .displayInline, children: acceptRejectChildren)
-            }
-            return UIMenu(children: [
-                acceptRejectMenu,
-                UIMenu(options: .displayInline, children: self.actionsForProfile(accountID: accountID, source: .view(cell))),
-            ])
-        }
-    }
-    
-    func collectionView(_ collectionView: UICollectionView, willPerformPreviewActionForMenuWith configuration: UIContextMenuConfiguration, animator: any UIContextMenuInteractionCommitAnimating) {
-        MenuPreviewHelper.willPerformPreviewAction(animator: animator, presenter: self)
-    }
-}
-
-extension FollowRequestNotificationViewController: UICollectionViewDragDelegate {
-    func collectionView(_ collectionView: UICollectionView, itemsForBeginning session: any UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
-        let provider = NSItemProvider(object: notification.account.url as NSURL)
-        let activity = UserActivityManager.showProfileActivity(id: notification.account.id, accountID: mastodonController.accountInfo!.id)
-        activity.displaysAuxiliaryScene = true
-        provider.registerObject(activity, visibility: .all)
-        return [UIDragItem(itemProvider: provider)]
-    }
-}
-
-extension FollowRequestNotificationViewController: TuskerNavigationDelegate {
-    var apiController: MastodonController! { mastodonController }
-}
-
-extension FollowRequestNotificationViewController: MenuActionProvider {
-}
-
-extension FollowRequestNotificationViewController: StatusBarTappableViewController {
-    func handleStatusBarTapped(xPosition: CGFloat) -> StatusBarTapActionResult {
-        collectionView.scrollToTop()
-        return .stop
-    }
-}

Tusker/Screens/Notifications/NotificationLoadingViewController.swift

@@ -89,7 +89,8 @@ class NotificationLoadingViewController: UIViewController {
         case .follow:
             vc = ProfileViewController(accountID: notification.account.id, mastodonController: mastodonController)
         case .followRequest:
-            vc = FollowRequestNotificationViewController(notification: notification, mastodonController: mastodonController)
+            // todo
+            return
         case .unknown:
             showLoadingError(Error.unknownType)
             return