thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1534 from Nheko-Reborn/issue1494

Browse source 
Use @user:example.com for all sample mxids
This commit is contained in:
DeepBlueV7.X 2023-10-01 12:57:03 +00:00 • committed by GitHub
commit e9104f8c69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/LoginPage.cpp
View file

@ -76,13 +76,13 @@ LoginPage::onMatrixIdEntered()
try {
user = parse<User>(mxid_.toStdString());
} catch (const std::exception &) {
mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org");
mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com");
emit mxidErrorChanged();
return;
}
if (user.hostname().empty() || user.localpart().empty()) {
mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org");
mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com");
emit mxidErrorChanged();
return;
} else {
@ -146,7 +146,7 @@ LoginPage::checkHomeserverVersion()
try {
User user = parse<User>(mxid_.toStdString());
} catch (const std::exception &) {
mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org");
mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com");
emit mxidErrorChanged();
return;
}
@ -273,7 +273,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod,
try {
user = parse<User>(userid.toStdString());
} catch (const std::exception &) {
mxidError_ = tr("You have entered an invalid Matrix ID e.g @joe:matrix.org");
mxidError_ = tr("You have entered an invalid Matrix ID e.g. @user:yourserver.example.com");
emit mxidErrorChanged();
return;
}