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

Bump mtxclient version

Browse Source
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();
} }

11
src/RegisterPage.cpp
View File

@ -109,8 +109,8 @@ 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(
@ -149,8 +149,8 @@ RegisterPage::versionsCheck()
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) {
@ -165,8 +165,7 @@ RegisterPage::versionsCheck()
} }
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;