Skip to content

send email change emails to old email address #8071

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

Merged
mergify merged 1 commit into from
Oct 21, 2026
Merged

send email change emails to old email address #8071

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
20 changes: 16 additions & 4 deletions apps/labrinth/src/queue/email.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,22 @@ impl EmailQueue {
.await
.wrap_internal_err("fetching user from database")?;

let Some(mailbox) = maybe_user
.and_then(|user| user.email)
.and_then(|email| email.parse().ok())
else {
let Some(user) = maybe_user else {
return Ok((
notification.id,
NotificationDeliveryStatus::SkippedPreferences,
));
};

// user email is new email at this point, pull old email from the notification body
let mailbox = match &notification.body {
NotificationBody::EmailChanged { to_email, .. } => {
to_email.parse().ok()
}
_ => user.email.and_then(|email| email.parse().ok()),
};

let Some(mailbox) = mailbox else {
return Ok((
notification.id,
NotificationDeliveryStatus::SkippedPreferences,
Expand Down
Loading