fix: Multiple plural variables rename

lebojo · lebojo · commit 7fda48185925 · 2025-03-19T14:56:48.000+01:00
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift
@@ -47,7 +47,7 @@ struct ActionsPanelViewModifier: ViewModifier {
 
     @ModalState private var reportForJunkMessages: [Message]?
     @ModalState private var reportedForDisplayProblemMessage: Message?
-    @ModalState private var reportedForPhishingMessage: [Message]?
+    @ModalState private var reportedForPhishingMessages: [Message]?
     @ModalState private var blockSenderAlert: BlockRecipientAlertState?
     @ModalState private var blockSendersList: BlockRecipientState?
     @ModalState private var messagesToMove: [Message]?
@@ -69,8 +69,8 @@ struct ActionsPanelViewModifier: ViewModifier {
             nearestMessagesToMoveSheet: $messagesToMove,
             nearestBlockSenderAlert: $blockSenderAlert,
             nearestBlockSendersList: $blockSendersList,
-            nearestReportJunkMessageActionsPanel: $reportForJunkMessages,
-            nearestReportedForPhishingMessageAlert: $reportedForPhishingMessage,
+            nearestReportJunkMessagesActionsPanel: $reportForJunkMessages,
+            nearestReportedForPhishingMessagesAlert: $reportedForPhishingMessages,
             nearestReportedForDisplayProblemMessageAlert: $reportedForDisplayProblemMessage,
             nearestShareMailLinkPanel: $shareMailLink,
             messagesToDownload: $messagesToDownload
@@ -104,15 +104,15 @@ struct ActionsPanelViewModifier: ViewModifier {
         }
         .customAlert(item: $blockSenderAlert) { blockSenderState in
             ConfirmationBlockRecipientView(
-                recipients: blockSenderState.recipient,
-                reportedMessages: blockSenderState.message,
+                recipients: blockSenderState.recipients,
+                reportedMessages: blockSenderState.messages,
                 origin: origin
             )
         }
         .customAlert(item: $reportedForDisplayProblemMessage) { message in
             ReportDisplayProblemView(message: message)
         }
-        .customAlert(item: $reportedForPhishingMessage) { messages in
+        .customAlert(item: $reportedForPhishingMessages) { messages in
             ReportPhishingView(
                 messagesWithDuplicates: messages,
                 distinctMessageCount: messages.count,
diff --git a/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift b/Mail/Views/Bottom sheets/Actions/ReportJunkView.swift
@@ -73,8 +73,6 @@ struct ReportJunkView: View {
 #Preview {
     ReportJunkView(
         reportedMessages: PreviewHelper.sampleMessages,
-        origin: .floatingPanel(source: .threadList),
-        completionHandler: { _ in }
-    )
+        origin: .floatingPanel(source: .threadList)) { _ in }
     .accentColor(AccentColor.pink.primary.swiftUIColor)
 }
diff --git a/MailCore/Cache/Actions/ActionOrigin.swift b/MailCore/Cache/Actions/ActionOrigin.swift
@@ -41,8 +41,8 @@ public struct ActionOrigin {
     private(set) var nearestMessagesToMoveSheet: Binding<[Message]?>?
     private(set) var nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>?
     private(set) var nearestBlockSendersList: Binding<BlockRecipientState?>?
-    private(set) var nearestReportJunkMessageActionsPanel: Binding<[Message]?>?
-    private(set) var nearestReportedForPhishingMessageAlert: Binding<[Message]?>?
+    private(set) var nearestReportJunkMessagesActionsPanel: Binding<[Message]?>?
+    private(set) var nearestReportedForPhishingMessagesAlert: Binding<[Message]?>?
     private(set) var nearestReportedForDisplayProblemMessageAlert: Binding<Message?>?
     private(set) var nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>?
     private(set) var messagesToDownload: Binding<[Message]?>?
@@ -55,8 +55,8 @@ public struct ActionOrigin {
         nearestMessagesToMoveSheet: Binding<[Message]?>? = nil,
         nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>? = nil,
         nearestBlockSendersList: Binding<BlockRecipientState?>? = nil,
-        nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
-        nearestReportedForPhishingMessageAlert: Binding<[Message]?>? = nil,
+        nearestReportJunkMessagesActionsPanel: Binding<[Message]?>? = nil,
+        nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
         nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
         nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
         messagesToDownload: Binding<[Message]?>? = nil
@@ -68,8 +68,8 @@ public struct ActionOrigin {
         self.nearestMessagesToMoveSheet = nearestMessagesToMoveSheet
         self.nearestBlockSenderAlert = nearestBlockSenderAlert
         self.nearestBlockSendersList = nearestBlockSendersList
-        self.nearestReportJunkMessageActionsPanel = nearestReportJunkMessageActionsPanel
-        self.nearestReportedForPhishingMessageAlert = nearestReportedForPhishingMessageAlert
+        self.nearestReportJunkMessagesActionsPanel = nearestReportJunkMessagesActionsPanel
+        self.nearestReportedForPhishingMessagesAlert = nearestReportedForPhishingMessagesAlert
         self.nearestReportedForDisplayProblemMessageAlert = nearestReportedForDisplayProblemMessageAlert
         self.nearestShareMailLinkPanel = nearestShareMailLinkPanel
         self.messagesToDownload = messagesToDownload
@@ -86,8 +86,8 @@ public struct ActionOrigin {
                                      nearestMessagesToMoveSheet: Binding<[Message]?>? = nil,
                                      nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>? = nil,
                                      nearestBlockSendersList: Binding<BlockRecipientState?>? = nil,
-                                     nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
-                                     nearestReportedForPhishingMessageAlert: Binding<[Message]?>? = nil,
+                                     nearestReportJunkMessagesActionsPanel: Binding<[Message]?>? = nil,
+                                     nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
                                      nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
                                      nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
                                      messagesToDownload: Binding<[Message]?>? = nil) -> ActionOrigin {
@@ -98,8 +98,8 @@ public struct ActionOrigin {
             nearestMessagesToMoveSheet: nearestMessagesToMoveSheet,
             nearestBlockSenderAlert: nearestBlockSenderAlert,
             nearestBlockSendersList: nearestBlockSendersList,
-            nearestReportJunkMessageActionsPanel: nearestReportJunkMessageActionsPanel,
-            nearestReportedForPhishingMessageAlert: nearestReportedForPhishingMessageAlert,
+            nearestReportJunkMessagesActionsPanel: nearestReportJunkMessagesActionsPanel,
+            nearestReportedForPhishingMessagesAlert: nearestReportedForPhishingMessagesAlert,
             nearestReportedForDisplayProblemMessageAlert: nearestReportedForDisplayProblemMessageAlert,
             nearestShareMailLinkPanel: nearestShareMailLinkPanel,
             messagesToDownload: messagesToDownload
diff --git a/MailCore/Cache/Actions/ActionsManager.swift b/MailCore/Cache/Actions/ActionsManager.swift
@@ -169,7 +169,7 @@ public class ActionsManager: ObservableObject {
             }
         case .reportJunk:
             Task { @MainActor in
-                origin.nearestReportJunkMessageActionsPanel?.wrappedValue = messagesWithDuplicates
+                origin.nearestReportJunkMessagesActionsPanel?.wrappedValue = messagesWithDuplicates
             }
         case .spam:
             let messagesFromFolder = messagesWithDuplicates.fromFolderOrSearch(originFolder: origin.frozenFolder)
@@ -180,7 +180,7 @@ public class ActionsManager: ObservableObject {
             }
         case .phishing:
             Task { @MainActor in
-                origin.nearestReportedForPhishingMessageAlert?.wrappedValue = messagesWithDuplicates
+                origin.nearestReportedForPhishingMessagesAlert?.wrappedValue = messagesWithDuplicates
             }
         case .reportDisplayProblem:
             Task { @MainActor in
@@ -198,8 +198,8 @@ public class ActionsManager: ObservableObject {
                     origin.nearestBlockSendersList?.wrappedValue = BlockRecipientState(recipientsToMessage: uniqueRecipient)
                 } else {
                     origin.nearestBlockSenderAlert?.wrappedValue = BlockRecipientAlertState(
-                        recipient: Array(uniqueRecipient.keys),
-                        message: messages
+                        recipients: Array(uniqueRecipient.keys),
+                        messages: messages
                     )
                 }
             }
diff --git a/MailCore/Utils/BlockRecipientState.swift b/MailCore/Utils/BlockRecipientState.swift
@@ -28,11 +28,11 @@ public struct BlockRecipientState: Identifiable {
 
 public struct BlockRecipientAlertState: Identifiable {
     public var id = UUID()
-    public let recipient: [Recipient]
-    public let message: [Message]
+    public let recipients: [Recipient]
+    public let messages: [Message]
 
-    public init(recipient: [Recipient], message: [Message]) {
-        self.recipient = recipient
-        self.message = message
+    public init(recipients: [Recipient], messages: [Message]) {
+        self.recipients = recipients
+        self.messages = messages
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public class ActionsManager: ObservableObject {`
`169`	`169`	`}`
`170`	`170`	`case .reportJunk:`
`171`	`171`	`Task { @MainActor in`
`172`		`- origin.nearestReportJunkMessageActionsPanel?.wrappedValue = messagesWithDuplicates`
	`172`	`+ origin.nearestReportJunkMessagesActionsPanel?.wrappedValue = messagesWithDuplicates`
`173`	`173`	`}`
`174`	`174`	`case .spam:`
`175`	`175`	`let messagesFromFolder = messagesWithDuplicates.fromFolderOrSearch(originFolder: origin.frozenFolder)`
`@@ -180,7 +180,7 @@ public class ActionsManager: ObservableObject {`
`180`	`180`	`}`
`181`	`181`	`case .phishing:`
`182`	`182`	`Task { @MainActor in`
`183`		`- origin.nearestReportedForPhishingMessageAlert?.wrappedValue = messagesWithDuplicates`
	`183`	`+ origin.nearestReportedForPhishingMessagesAlert?.wrappedValue = messagesWithDuplicates`
`184`	`184`	`}`
`185`	`185`	`case .reportDisplayProblem:`
`186`	`186`	`Task { @MainActor in`
`@@ -198,8 +198,8 @@ public class ActionsManager: ObservableObject {`
`198`	`198`	`origin.nearestBlockSendersList?.wrappedValue = BlockRecipientState(recipientsToMessage: uniqueRecipient)`
`199`	`199`	`} else {`
`200`	`200`	`origin.nearestBlockSenderAlert?.wrappedValue = BlockRecipientAlertState(`
`201`		`- recipient: Array(uniqueRecipient.keys),`
`202`		`- message: messages`
	`201`	`+ recipients: Array(uniqueRecipient.keys),`
	`202`	`+ messages: messages`
`203`	`203`	`)`
`204`	`204`	`}`
`205`	`205`	`}`