Add ability to report a collection

Contributes to IOS-736

Author: whattherestimefor

Mastodon/In Progress New Layout and Datamodel/Common Components/Common Actions on Statuses and Accounts/MastodonMenuAction.swift

@@ -399,7 +399,7 @@ extension CollectionViewModel {
                 .navigationalAction(.share([collection.url]))
             ]),
             .init(.blockingOptions, items: [
-                .relationshipAction(.reportUser),
+                .collectionAction(.reportCollection),
                 .relationshipAction(.blockUser)
             ])
         ].compactMap { $0 }
@@ -417,7 +417,7 @@ extension CollectionViewModel {
         return [
             navigations,
             .init(.blockingOptions, items: [
-                .relationshipAction(.reportUser),
+                .collectionAction(.reportCollection),
                 .relationshipAction(.blockUser)
             ])
         ].compactMap { $0 }
@@ -901,6 +901,14 @@ extension MastodonAccount {
     @MainActor
     func reportViewModel(withStatus status: MastodonStatus?, relationship: MastodonAccount.Relationship) -> ReportViewModel? {
         guard let legacyRelationship = relationship.info?._legacyEntity, let authBox = AuthenticationServiceProvider.shared.currentActiveUser.value else { return nil }
-        return ReportViewModel(context: AppContext.shared, authenticationBox: authBox, account: _legacyEntity, relationship: legacyRelationship, status: status, contentDisplayMode: .neverConceal)
+        return ReportViewModel(context: AppContext.shared, authenticationBox: authBox, account: _legacyEntity, relationship: legacyRelationship, status: status, collection: nil, contentDisplayMode: .neverConceal)
+    }
+}
+
+extension MastodonAccount {
+    @MainActor
+    func reportViewModel(withCollection collection: Mastodon.Entity.Collection, relationship: MastodonAccount.Relationship) -> ReportViewModel? {
+        guard let legacyRelationship = relationship.info?._legacyEntity, let authBox = AuthenticationServiceProvider.shared.currentActiveUser.value else { return nil }
+        return ReportViewModel(context: AppContext.shared, authenticationBox: authBox, account: _legacyEntity, relationship: legacyRelationship, status: nil, collection: collection, contentDisplayMode: .neverConceal)
     }
 }

Mastodon/In Progress New Layout and Datamodel/Common Components/Common Actions on Statuses and Accounts/MastodonPostMenuAction.swift

@@ -89,7 +89,7 @@ enum MastodonPostMenuAction: String {
     case removeQuote
     case blockUser
     case unblockUser
-    case reportUser
+    case reportPost
 
     // DELETE
     case deletePost
@@ -120,7 +120,7 @@ enum MastodonPostMenuAction: String {
         case .blockUser, .unblockUser:
             true
 
-        case .reportUser:
+        case .reportPost:
             false
 
         case .deletePost:
@@ -151,7 +151,7 @@ enum MastodonPostMenuAction: String {
         case .blockUser, .unblockUser:
             false
 
-        case .reportUser:
+        case .reportPost:
             false
 
         case .deletePost, .removeQuote:
@@ -177,7 +177,7 @@ enum MastodonPostMenuAction: String {
             PostAction.bookmark.systemIconName(filled: true)
         case .translatePost, .showOriginalLanguage:
             "character.book.closed"
-        case .reportUser:
+        case .reportPost:
             "flag"
         case .follow:
             "person.badge.plus"
@@ -233,7 +233,7 @@ enum MastodonPostMenuAction: String {
             return L10n.Common.Controls.Actions.TranslatePost.title(language)
         case .showOriginalLanguage:
             return L10n.Common.Controls.Status.Translation.showOriginal
-        case .reportUser:
+        case .reportPost:
             return L10n.Common.Controls.Actions.reportUser(username)
         case .follow:
             return L10n.Common.Controls.Actions.follow(username)
@@ -268,7 +268,7 @@ enum MastodonPostMenuAction: String {
 
     var isDestructive: Bool {
         switch self {
-        case .blockUser, .reportUser, .deletePost, .removeQuote:
+        case .blockUser, .reportPost, .deletePost, .removeQuote:
             return true
         default:
             return false
@@ -309,7 +309,7 @@ enum MastodonPostMenuAction: String {
                 defensiveActions = [
                     isQuotingMe ? .removeQuote : nil,
                     info.iAmBlockingThem ? .unblockUser : .blockUser,
-                    .reportUser
+                    .reportPost
                 ].compactMap { $0 }
             } else {
                 relationshipActions = nil
@@ -355,7 +355,7 @@ enum MastodonPostMenuAction: String {
                 defensiveActions = [
                     isQuotingMe ? .removeQuote : nil,
                     info.iAmBlockingThem ? .unblockUser : .blockUser,
-                    .reportUser
+                    .reportPost
                 ].compactMap { $0 }
             } else {
                 relationshipActions = []

Mastodon/In Progress New Layout and Datamodel/Common Components/Views/TimelineRowViews/CollectionRowView.swift

@@ -182,8 +182,9 @@ struct CollectionRowView: View {
     func doMenuAction(_ action: MastodonMenuAction.CollectionMenuAction, navigator: MastodonNavigationRouter) async throws {
         switch action {
         case .reportCollection:
-            // TODO: implement
-            assertionFailure("reportCollection is not yet implemented")
+            guard let relationship = relationshipViewModel.relationship, let account = authorAccount else { return }
+            guard let reportViewModel = account.reportViewModel(withCollection: collection, relationship: relationship) else { return }
+            navigator.presentModal(.legacy(scene: .report(viewModel: reportViewModel), transition: .modal(animated: true, completion: nil)))
         case .removeMyself:
             if let meItem = collection.items.first(where: { $0.account_id == AuthenticationServiceProvider.shared.currentActiveUser.value?.userID }) {
                 doRemoveMe(meItemID: meItem.id, navigator: navigator)

Mastodon/In Progress New Layout and Datamodel/Timeline/TimelineListViewController.swift

@@ -3121,7 +3121,7 @@ extension TimelineListViewModel: MastodonPostMenuActionHandler {
                 case .removeQuote:
                     try await doRemoveQuote(from: actionablePost, askFirst: true, navigator: navigator)
 
-                case .reportUser:
+                case .reportPost:
                     guard let relationship = try await APIService.shared.relationship(forAccountIds: [author.id], authenticationBox: authenticatedUser).value.first else { throw PostActionFailure.noRelationshipInfo }
                     let accountToReport = try await APIService.shared.accountInfo(domain: authenticatedUser.domain, userID: author.id, authorization: authenticatedUser.userAuthorization)
 
@@ -3134,6 +3134,7 @@ extension TimelineListViewModel: MastodonPostMenuActionHandler {
                         account: accountToReport,
                         relationship: relationship,
                         status: statusEntity == nil ? nil : MastodonStatus(entity: statusEntity!, showDespiteContentWarning: true),
+                        collection: nil,
                         contentDisplayMode: .neverConceal
                     )
                     navigator.presentModal(.legacy(scene: .report(viewModel: reportViewModel), transition: .modal(animated: true, completion: nil)))

Mastodon/Scene/Report/Report/ReportViewModel.swift

@@ -28,6 +28,7 @@ class ReportViewModel {
     let account: Mastodon.Entity.Account
     let relationship: Mastodon.Entity.Relationship
     let status: MastodonStatus?
+    let collection: Mastodon.Entity.Collection?
 
     // output
     @Published var isReporting = false
@@ -40,6 +41,7 @@ class ReportViewModel {
         account: Mastodon.Entity.Account,
         relationship: Mastodon.Entity.Relationship,
         status: MastodonStatus?,
+        collection: Mastodon.Entity.Collection?,
         contentDisplayMode: StatusView.ContentDisplayMode
     ) {
         self.contentDisplayMode = contentDisplayMode
@@ -48,6 +50,7 @@ class ReportViewModel {
         self.account = account
         self.relationship = relationship
         self.status = status
+        self.collection = collection
         self.reportReasonViewModel = ReportReasonViewModel(context: context)
         self.reportServerRulesViewModel = ReportServerRulesViewModel(context: context)
         self.reportStatusViewModel = ReportStatusViewModel(context: context, authenticationBox: authenticationBox, account: account, status: status)
@@ -115,9 +118,17 @@ extension ReportViewModel {
                 return nil
             }
         }()
+        
+        // collections can be reported from the menu but will not be shown in the user interface for now
+        let collectionIDs: [Mastodon.Entity.Collection.ID]? = {
+            guard let collection = self.collection else { return nil }
+            return [collection.id]
+        }()
+        
         let query = Mastodon.API.Reports.FileReportQuery(
             accountID: account.id,
             statusIDs: statusIDs,
+            collectionIDs: collectionIDs,
             comment: comment,
             forward: true,
             category: {

MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Report.swift

@@ -68,6 +68,7 @@ public extension Mastodon.API.Reports {
     class FileReportQuery: Codable, PostQuery {
         public let accountID: Mastodon.Entity.Account.ID
         public var statusIDs: [Mastodon.Entity.Status.ID]?
+        public var collectionIDs: [Mastodon.Entity.Collection.ID]?
         public var comment: String?
         public let forward: Bool?
 
@@ -77,6 +78,7 @@ public extension Mastodon.API.Reports {
         enum CodingKeys: String, CodingKey {
             case accountID = "account_id"
             case statusIDs = "status_ids"
+            case collectionIDs = "collection_ids"
             case comment
             case forward
             case category
@@ -93,13 +95,15 @@ public extension Mastodon.API.Reports {
         public init(
             accountID: Mastodon.Entity.Account.ID,
             statusIDs: [Mastodon.Entity.Status.ID]?,
+            collectionIDs: [Mastodon.Entity.Collection.ID]?,
             comment: String?,
             forward: Bool?,
             category: Category?,
             ruleIDs: [Mastodon.Entity.Instance.Rule.ID]?
         ) {
             self.accountID = accountID
             self.statusIDs = statusIDs
+            self.collectionIDs = collectionIDs
             self.comment = comment
             self.forward = forward
             self.category = category