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

feat(DraftContentManager): Use Dictionary(grouping:, by:) #905

Merged
merged 1 commit into from
Jul 28, 2023
Merged

feat(DraftContentManager): Use Dictionary(grouping:, by:) #905

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
14 changes: 5 additions & 9 deletions MailCore/Cache/DraftContentManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,12 @@ public class DraftContentManager: ObservableObject {
private func guessMostFittingSignature(userSignatures: [Signature], defaultSignature: Signature) -> Signature {
guard let previousMessage = messageReply?.message else { return defaultSignature }

var signaturesAssociatedToEmail = [String: [Signature]]()
for signature in userSignatures {
signaturesAssociatedToEmail[signature.senderEmail, default: []].append(signature)
}

let signaturesGroupedByEmail = Dictionary(grouping: userSignatures, by: \.senderEmail)
let recipientsFieldsToCheck = [\Message.to, \Message.from, \Message.cc]
for field in recipientsFieldsToCheck {
if let signature = findSignatureInRecipients(
recipients: previousMessage[keyPath: field],
signaturesAssociatedToEmail: signaturesAssociatedToEmail
signaturesGroupedByEmail: signaturesGroupedByEmail
) {
return signature.freezeIfNeeded()
}
Expand All @@ -220,15 +216,15 @@ public class DraftContentManager: ObservableObject {
}

private func findSignatureInRecipients(recipients: List<Recipient>,
signaturesAssociatedToEmail: [String: [Signature]]) -> Signature? {
let matchingEmailRecipients = recipients.filter { signaturesAssociatedToEmail[$0.email] != nil }.toArray()
signaturesGroupedByEmail: [String: [Signature]]) -> Signature? {
let matchingEmailRecipients = recipients.filter { signaturesGroupedByEmail[$0.email] != nil }.toArray()
guard !matchingEmailRecipients.isEmpty else { return nil }

var bestSignature: Signature?
var bestMatchingScore: SignatureMatch?

for recipient in matchingEmailRecipients {
guard let signatures = signaturesAssociatedToEmail[recipient.email],
guard let signatures = signaturesGroupedByEmail[recipient.email],
let (signature, computedScore) = computeScore(for: signatures, recipient: recipient) else { continue }

if computedScore == .exactMatchDefault {
Expand Down
Loading