From 8f80996515723dbe4da6ce9ffa05f5f06ec74bbb Mon Sep 17 00:00:00 2001 From: Zach H Date: Fri, 7 Nov 2025 13:35:44 -0500 Subject: [PATCH] Strip dashes in Yahoo addresses (#6284) --- servatrice/src/email_parser.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/servatrice/src/email_parser.cpp b/servatrice/src/email_parser.cpp index ebb9cece3..d8c30d852 100644 --- a/servatrice/src/email_parser.cpp +++ b/servatrice/src/email_parser.cpp @@ -25,7 +25,7 @@ QPair EmailParser::parseEmailAddress(const QString &dirtyEmail // Trim out dots and pluses from Google/Gmail domains if (capturedEmailAddressDomain.toLower() == "gmail.com") { - // Remove all content after first plus sign (as unnecessary with gmail) + // Remove all content after the first plus sign (as unnecessary with gmail) // https://gmail.googleblog.com/2008/03/2-hidden-ways-to-get-more-from-your.html const auto firstPlusSign = capturedEmailUser.indexOf("+"); if (firstPlusSign != -1) { @@ -36,6 +36,13 @@ QPair EmailParser::parseEmailAddress(const QString &dirtyEmail // https://gmail.googleblog.com/2008/03/2-hidden-ways-to-get-more-from-your.html capturedEmailUser.replace(".", ""); } + // Trim out minuses from Yahoo domains + else if (capturedEmailAddressDomain.toLower() == "yahoo.com") { + const auto firstMinusSign = capturedEmailUser.indexOf("-"); + if (firstMinusSign != -1) { + capturedEmailUser = capturedEmailUser.left(firstMinusSign); + } + } return {capturedEmailUser, capturedEmailAddressDomain}; }