Skip to content

Commit 2136128

Browse files
committed
refactor: Use external parameter name
1 parent cde4c91 commit 2136128

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

Mail/Views/Bottom sheets/Actions/ActionsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct ActionsView: View {
3838
let userIsStaff = user.isStaff ?? false
3939

4040
targetMessages = messages
41-
actionsLists = Action.actionsForMessages(messages, origin: origin, userIsStaff: userIsStaff, userEmail: user.email)
41+
actionsLists = Action.actionsForMessages(messages, from: origin, userIsStaff: userIsStaff, userEmail: user.email)
4242
self.origin = origin
4343
self.completionHandler = completionHandler
4444
}

Mail/Views/Thread List/MultipleSectionViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ class MultipleSelectionViewModel: ObservableObject {
9696
let read = selectedItems.values.contains { $0.unseenMessages != 0 } ? Action.markAsRead : Action.markAsUnread
9797
let star = selectedItems.values.allSatisfy(\.flagged) ? Action.unstar : Action.star
9898
let archive = fromArchiveFolder ? Action.openMovePanel : Action.archive
99-
toolbarActions = Action.getBottomBarActions(
100-
originType: .multipleSelection,
99+
toolbarActions = Action.bottomBarActions(
100+
for: .multipleSelection,
101101
unreadAction: read,
102102
archiveAction: archive,
103103
starAction: star

Mail/Views/Thread List/ThreadListCellContextMenu.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct ThreadListCellContextMenu: ViewModifier {
4848
private var actions: Action.Lists {
4949
Action.actionsForMessages(
5050
thread.messages.toArray(),
51-
origin: origin,
51+
from: origin,
5252
userIsStaff: currentUser.value.isStaff ?? false,
5353
userEmail: currentUser.value.email
5454
)

Mail/Views/Thread/WebView/ThreadViewToolbarModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct ThreadViewToolbarModifier: ViewModifier {
4848
private var toolbarActions: Action.Lists {
4949
return Action.actionsForMessages(
5050
frozenMessages,
51-
origin: .floatingPanel(source: .messageList, originFolder: frozenFolder),
51+
from: .floatingPanel(source: .messageList, originFolder: frozenFolder),
5252
userIsStaff: false,
5353
userEmail: mailboxManager.mailbox.email
5454
)

MailCore/Cache/Actions/Action+List.swift

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extension Action: CaseIterable {
108108
return actions.compactMap { $0 }
109109
}
110110

111-
private static func snoozedActions(_ messages: [Message], folder: Folder?) -> [Action] {
111+
private static func snoozedActions(for messages: [Message], from folder: Folder?) -> [Action] {
112112
guard folder?.canAccessSnoozeActions == true else { return [] }
113113

114114
let messagesFromFolder = messages.filter { $0.folder?.remoteId == folder?.remoteId }
@@ -122,7 +122,7 @@ extension Action: CaseIterable {
122122
}
123123

124124
public static func actionsForMessages(_ messages: [Message],
125-
origin: ActionOrigin,
125+
from origin: ActionOrigin,
126126
userIsStaff: Bool,
127127
userEmail: String) -> Action.Lists {
128128
guard !messages.allSatisfy({ $0.isScheduledDraft == true }),
@@ -134,13 +134,12 @@ extension Action: CaseIterable {
134134
bottomBarActions: [.delete]
135135
)
136136
}
137-
return actionsForNormalMessages(messages, origin: origin, userIsStaff: userIsStaff, userEmail: userEmail)
137+
return actionsForNormalMessages(messages, from: origin, userIsStaff: userIsStaff, userEmail: userEmail)
138138
}
139139

140-
private static func getArchiveAction(
141-
originFolderRole: FolderRole?,
142-
messagesAreSnoozed: Bool
143-
) -> Action? {
140+
private static func archiveAction(for originFolderRole: FolderRole?,
141+
142+
messagesAreSnoozed: Bool) -> Action? {
144143
guard originFolderRole != .spam,
145144
!messagesAreSnoozed
146145
else {
@@ -149,23 +148,23 @@ extension Action: CaseIterable {
149148
return originFolderRole != .archive ? .archive : .moveToInbox
150149
}
151150

152-
private static func getSpamAction(originFolderRole: FolderRole?, messagesRecipients: [Recipient],
153-
userEmail: String) -> Action? {
151+
private static func spamAction(for originFolderRole: FolderRole?, messagesRecipients: [Recipient],
152+
userEmail: String) -> Action? {
154153
guard !messagesRecipients.allSatisfy({ $0.isMeOrPlusMe(currentMailboxEmail: userEmail) }) else {
155154
return nil
156155
}
157156
return originFolderRole == .spam ? .nonSpam : .reportJunk
158157
}
159158

160-
private static func getReportDisplayProblemAction(userIsStaff: Bool, isMessageDetails: Bool) -> Action? {
159+
private static func reportDisplayProblemAction(userIsStaff: Bool, isMessageDetails: Bool) -> Action? {
161160
guard userIsStaff, isMessageDetails else {
162161
return nil
163162
}
164163
return .reportDisplayProblem
165164
}
166165

167-
public static func getBottomBarActions(
168-
originType: ActionOrigin.ActionOriginType,
166+
public static func bottomBarActions(
167+
for originType: ActionOrigin.ActionOriginType,
169168
unreadAction: Action,
170169
archiveAction: Action?,
171170
starAction: Action
@@ -181,33 +180,33 @@ extension Action: CaseIterable {
181180
}
182181

183182
private static func actionsForNormalMessages(_ messages: [Message],
184-
origin: ActionOrigin,
183+
from origin: ActionOrigin,
185184
userIsStaff: Bool,
186185
userEmail: String)
187186
-> Action.Lists {
188187
@LazyInjectService var platformDetector: PlatformDetectable
189188

190189
let unreadAction: Action = messages.allSatisfy(\.seen) ? .markAsUnread : .markAsRead
191-
let archiveAction = getArchiveAction(
192-
originFolderRole: origin.frozenFolder?.role,
190+
let archiveAction = archiveAction(
191+
for: origin.frozenFolder?.role,
193192
messagesAreSnoozed: messages.allSatisfy(\.isSnoozed)
194193
)
195194
let openMovePanelAction: Action? = messages.allSatisfy(\.isMovable) ? .openMovePanel : nil
196-
let spamAction = getSpamAction(
197-
originFolderRole: origin.frozenFolder?.role,
195+
let spamAction = spamAction(
196+
for: origin.frozenFolder?.role,
198197
messagesRecipients: messages.flatMap(\.from),
199198
userEmail: userEmail
200199
)
201200
let starAction: Action = messages.contains { $0.flagged } ? .unstar : .star
202-
let reportDisplayProblemAction = getReportDisplayProblemAction(
201+
let reportDisplayProblemAction = reportDisplayProblemAction(
203202
userIsStaff: userIsStaff,
204203
isMessageDetails: origin.type.isMessageDetails
205204
)
206205

207206
let quickActions: [Action] = origin.type.isMessageDetails ? [.reply, .replyAll, .forward, .delete] : []
208207

209208
var listActions: [Action?] = [origin.type == .floatingPanel(source: .contextMenu) ? .activeMultiSelect : nil] +
210-
(!origin.type.isMessageDetails ? snoozedActions(messages, folder: origin.frozenFolder) : []) +
209+
(!origin.type.isMessageDetails ? snoozedActions(for: messages, from: origin.frozenFolder) : []) +
211210
[openMovePanelAction, spamAction]
212211

213212
if origin.type != .floatingPanel(source: .threadList) {
@@ -221,8 +220,8 @@ extension Action: CaseIterable {
221220
]
222221
}
223222

224-
let bottomBarActions = getBottomBarActions(
225-
originType: origin.type,
223+
let bottomBarActions = bottomBarActions(
224+
for: origin.type,
226225
unreadAction: unreadAction,
227226
archiveAction: archiveAction,
228227
starAction: starAction

0 commit comments

Comments
 (0)