d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't let old server lookups overwrite new ones

Browse source
This commit is contained in:
Nicolas Werner 2022-10-05 19:20:14 +02:00
parent d70a344a4d
commit aed1440d26
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/LoginPage.cpp
View file

@ -108,7 +108,13 @@ LoginPage::onMatrixIdEntered()
emit homeserverChanged(); emit homeserverChanged();
http::client()->well_known( http::client()->well_known(
[this](const mtx::responses::WellKnown &res, mtx::http::RequestErr err) { [this, orginal_hostname = user.hostname()](const mtx::responses::WellKnown &res,
mtx::http::RequestErr err) {
// Ignore if server changed
auto currentUser = parse<User>(mxid_.toStdString());
if (currentUser.hostname() != orginal_hostname)
return;
if (err) { if (err) {
if (err->status_code == 404) { if (err->status_code == 404) {
nhlog::net()->info("Autodiscovery: No .well-known."); nhlog::net()->info("Autodiscovery: No .well-known.");

6
src/RegisterPage.cpp
View file

@ -67,7 +67,11 @@ RegisterPage::setServer(const QString &server)
emit lookingUpHsChanged(); emit lookingUpHsChanged();
http::client()->well_known( http::client()->well_known(
[this](const mtx::responses::WellKnown &res, mtx::http::RequestErr err) { [this, prevServer = server](const mtx::responses::WellKnown &res, mtx::http::RequestErr err) {
// server changed in between
if (lastServer != prevServer)
return;
if (err) { if (err) {
if (err->status_code == 404) { if (err->status_code == 404) {
nhlog::net()->info("Autodiscovery: No .well-known."); nhlog::net()->info("Autodiscovery: No .well-known.");