gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases 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:17:26 -04:00
parent 051be37419
commit affc288144
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servatrice/src/serversocketinterface.cpp
+9 -4
View File
@@ -983,14 +983,19 @@ QString AbstractServerSocketInterface::parseEmailAddress(const std::string &stdE
const auto match = emailRegex.match(emailAddress);
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
if (capturedEmailAddressDomain.toLower() == "gmail.com" ||
capturedEmailAddressDomain.toLower() == "googlemail.com") {
if (capturedEmailAddressDomain.toLower() == "gmail.com") {
QString capturedEmailUser = match.captured(1);
// Remove all content after first plus sign (as unnecessary with gmail)