aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use gmail over googlemail in all cases, as they're the same alias

Browse source
This commit is contained in:
ZeldaZach 2021-08-27 23:10:56 -04:00
parent 051be37419
commit affc288144
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servatrice/src/serversocketinterface.cpp
View file

@ -983,14 +983,19 @@ QString AbstractServerSocketInterface::parseEmailAddress(const std::string &stdE
const auto match = emailRegex.match(emailAddress); const auto match = emailRegex.match(emailAddress);
if (emailAddress.isEmpty() || !match.hasMatch()) { if (emailAddress.isEmpty() || !match.hasMatch()) {
return QString(); return {};
} }
const QString capturedEmailAddressDomain = match.captured(2); QString capturedEmailAddressDomain = match.captured(2);
// Replace googlemail.com with gmail.com, as is standard nowadays
// https://www.gmass.co/blog/domains-gmail-com-googlemail-com-and-google-com/
if (capturedEmailAddressDomain.toLower() == "googlemail.com") {
capturedEmailAddressDomain = "gmail.com";
}
// Trim out dots and pluses from Google/Gmail domains // Trim out dots and pluses from Google/Gmail domains
if (capturedEmailAddressDomain.toLower() == "gmail.com" || if (capturedEmailAddressDomain.toLower() == "gmail.com") {
capturedEmailAddressDomain.toLower() == "googlemail.com") {
QString capturedEmailUser = match.captured(1); QString capturedEmailUser = match.captured(1);
// Remove all content after first plus sign (as unnecessary with gmail) // Remove all content after first plus sign (as unnecessary with gmail)