backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

changelog entry for remote device key query logging

Browse source
This commit is contained in:
Benjamin Lee 2024-08-10 15:00:12 -07:00
parent 141c60e4a3
commit 91739899e7
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
book/changelog.md
View file

@ -103,7 +103,8 @@ This will be the first release of Grapevine since it was forked from Conduit
[!50](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/50), [!50](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/50),
[!52](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/52), [!52](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/52),
[!54](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/54), [!54](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/54),
[!56](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/56)) [!56](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/56),
[!69](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/69))
5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`. 5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`.
([!12](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/12)) ([!12](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/12))
6. **BREAKING:** Allow federation by default. 6. **BREAKING:** Allow federation by default.

4
src/api/client_server/keys.rs
View file

@ -430,6 +430,8 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
for (user_id, keys) in vec { for (user_id, keys) in vec {
device_keys_input_fed.insert(user_id.to_owned(), keys.clone()); device_keys_input_fed.insert(user_id.to_owned(), keys.clone());
} }
// TODO: switch .and_then(|result| result) to .flatten() when stable
// <https://github.com/rust-lang/rust/issues/70142>
( (
server, server,
tokio::time::timeout( tokio::time::timeout(
@ -443,8 +445,6 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
) )
.await .await
.map_err(|_e| Error::BadServerResponse("Query took too long")) .map_err(|_e| Error::BadServerResponse("Query took too long"))
// TODO: switch to .flatten() when stable
// <https://github.com/rust-lang/rust/issues/70142>
.and_then(|result| result), .and_then(|result| result),
) )
}) })