rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump mtxclient version

This commit is contained in:
Nicolas Werner 2023-01-12 02:59:16 +01:00
parent 0833b39781
commit 8a619d2fea
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
4 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -595,7 +595,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG b8f0e821066946fd567ea6a11933ebce69d72b6f GIT_TAG 79dcdbb8daad2efb06147e136702a12cd8877aba
) )
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
io.github.NhekoReborn.Nheko.yaml
View File

@ -182,7 +182,7 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
name: mtxclient name: mtxclient
sources: sources:
- commit: b8f0e821066946fd567ea6a11933ebce69d72b6f - commit: 79dcdbb8daad2efb06147e136702a12cd8877aba
#tag: v0.8.2 #tag: v0.8.2
type: git type: git
url: https://github.com/Nheko-Reborn/mtxclient.git url: https://github.com/Nheko-Reborn/mtxclient.git

1
src/MatrixClient.h
View File

@ -21,4 +21,3 @@ is_logged_in();
void void
init(); init();
} }

113
src/RegisterPage.cpp
View File

@ -109,70 +109,69 @@ RegisterPage::versionsCheck()
{ {
// Make a request to /_matrix/client/versions to check the address // Make a request to /_matrix/client/versions to check the address
// given is a Matrix homeserver. // given is a Matrix homeserver.
http::client()->versions( http::client()->versions([this](const mtx::responses::Versions &versions,
[this](const mtx::responses::Versions &versions, mtx::http::RequestErr err) { mtx::http::RequestErr err) {
if (err) { if (err) {
if (err->status_code == 404) { if (err->status_code == 404) {
setHsError( setHsError(
tr("The required endpoints were not found. Possibly not a Matrix server.")); tr("The required endpoints were not found. Possibly not a Matrix server."));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
if (!err->parse_error.empty()) { if (!err->parse_error.empty()) {
setHsError( setHsError(
tr("Received malformed response. Make sure the homeserver domain is valid.")); tr("Received malformed response. Make sure the homeserver domain is valid."));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
setHsError(tr("An unknown error occured. Make sure the homeserver domain is valid.")); setHsError(tr("An unknown error occured. Make sure the homeserver domain is valid."));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
if (std::find_if( if (std::find_if(
versions.versions.cbegin(), versions.versions.cend(), [](const std::string &v) { versions.versions.cbegin(), versions.versions.cend(), [](const std::string &v) {
static const std::set<std::string_view, std::less<>> supported{ static const std::set<std::string_view, std::less<>> supported{
"v1.1", "v1.1",
"v1.2", "v1.2",
"v1.3", "v1.3",
"v1.4", "v1.4",
"v1.5", "v1.5",
}; };
return supported.count(v) != 0; return supported.count(v) != 0;
}) == versions.versions.cend()) { }) == versions.versions.cend()) {
emit setHsError( emit setHsError(
tr("The selected server does not support a version of the Matrix protocol that " tr("The selected server does not support a version of the Matrix protocol that "
"this client understands (v1.1 to v1.5). You can't register.")); "this client understands (v1.1 to v1.5). You can't register."));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
http::client()->registration( http::client()->registration([this](const mtx::responses::Register &,
[this](const mtx::responses::Register &, mtx::http::RequestErr e) { mtx::http::RequestErr e) {
nhlog::net()->debug("Registration check: {}", e); nhlog::net()->debug("Registration check: {}", e);
if (!e) { if (!e) {
setHsError(tr("Server does not support querying registration flows!")); setHsError(tr("Server does not support querying registration flows!"));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
if (e->status_code != 401) { if (e->status_code != 401) {
setHsError(tr("Server does not support registration.")); setHsError(tr("Server does not support registration."));
emit hsErrorChanged(); emit hsErrorChanged();
return; return;
} }
for (const auto &f : e->matrix_error.unauthorized.flows) for (const auto &f : e->matrix_error.unauthorized.flows)
nhlog::ui()->debug("Registration flows for server: {}", nhlog::ui()->debug("Registration flows for server: {}", fmt::join(f.stages, ", "));
fmt::join(f.stages, ", "));
supported_ = true; supported_ = true;
lookingUpHs_ = false; lookingUpHs_ = false;
emit lookingUpHsChanged(); emit lookingUpHsChanged();
}); });
}); });
} }
void void