Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Same code for messages and threads when toggling star #904

Merged
merged 1 commit into from
Jul 28, 2023
Merged

refactor: Same code for messages and threads when toggling star #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions Mail/Views/Bottom sheets/Actions/ActionsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,18 +438,12 @@ enum ActionsTarget: Equatable, Identifiable {
}

private func star() async throws {
switch target {
case .threads(let threads, _):
await tryOrDisplayError {
await tryOrDisplayError {
switch target {
case .threads(let threads, _):
try await mailboxManager.toggleStar(threads: threads)
}
case .message(let message):
await tryOrDisplayError {
if message.flagged {
_ = try await mailboxManager.unstar(messages: [message])
} else {
_ = try await mailboxManager.star(messages: [message])
}
case .message(let message):
try await mailboxManager.toggleStar(messages: [message])
}
}
}
Expand Down
30 changes: 17 additions & 13 deletions MailCore/Cache/MailboxManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,18 +410,10 @@ public class MailboxManager: ObservableObject {
}

public func toggleStar(threads: [Thread]) async throws {
if threads.contains(where: { !$0.flagged }) {
let messages = threads.flatMap { thread in
thread.lastMessageAndItsDuplicateToExecuteAction(currentMailboxEmail: mailbox.email)
}
_ = try await star(messages: messages)
} else {
var messages = threads.flatMap { thread in
thread.messages.where { $0.isDraft == false }
}
messages.append(contentsOf: messages.flatMap(\.duplicates))
_ = try await unstar(messages: messages)
let messagesToToggleStar = threads.flatMap { thread in
thread.lastMessageAndItsDuplicateToExecuteAction(currentMailboxEmail: mailbox.email)
}
try await toggleStar(messages: messagesToToggleStar)
}

// MARK: - Search
Expand Down Expand Up @@ -1092,13 +1084,25 @@ public class MailboxManager: ObservableObject {
try await refreshFolder(from: messages)
}

public func star(messages: [Message]) async throws -> MessageActionResult {
public func toggleStar(messages: [Message]) async throws {
if messages.contains(where: { !$0.flagged }) {
let messagesToStar = messages + messages.flatMap(\.duplicates)
_ = try await star(messages: messagesToStar)
} else {
let messagesToUnstar = messages
.compactMap { $0.originalThread?.messages.where { $0.isDraft == false } }
.flatMap { $0 + $0.flatMap(\.duplicates) }
_ = try await unstar(messages: messagesToUnstar)
}
}

private func star(messages: [Message]) async throws -> MessageActionResult {
let response = try await apiFetcher.star(mailbox: mailbox, messages: messages)
try await refreshFolder(from: messages)
return response
}

public func unstar(messages: [Message]) async throws -> MessageActionResult {
private func unstar(messages: [Message]) async throws -> MessageActionResult {
let response = try await apiFetcher.unstar(mailbox: mailbox, messages: messages)
try await refreshFolder(from: messages)
return response
Expand Down
Loading