chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

federation-api: Move cross-signing properties of get_keys::Response out of unstable-pre-spec

Browse Source 
Part of #808
This commit is contained in:
Kévin Commaille 2022-02-10 14:52:24 +01:00
parent 69134c21e5
commit 36d181daac
No known key found for this signature in database
GPG Key ID: DD507DAE96E8245C
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ruma-federation-api/CHANGELOG.md
View File

@ -11,6 +11,7 @@ Improvements:
* Move `knock` module out of `unstable-pre-spec` * Move `knock` module out of `unstable-pre-spec`
* `knock:::send_knock::v1::Request` requires a PDU instead of the `knock_event` * `knock:::send_knock::v1::Request` requires a PDU instead of the `knock_event`
* Move cross-signing properties of `keys::get_keys::v1::Response` out of `unstable-pre-spec`
# 0.3.1 # 0.3.1

8
crates/ruma-federation-api/src/keys/get_keys/v1.rs
View File

@ -1,11 +1,9 @@
//! [POST /_matrix/federation/v1/user/keys/query](https://matrix.org/docs/spec/server_server/r0.1.4#post-matrix-federation-v1-user-keys-query) //! [POST /_matrix/federation/v1/user/keys/query](https://spec.matrix.org/v1.1/server-server-api/#post_matrixfederationv1userkeysquery)
use std::collections::BTreeMap; use std::collections::BTreeMap;
use ruma_api::ruma_api; use ruma_api::ruma_api;
#[cfg(feature = "unstable-pre-spec")] use ruma_common::encryption::{CrossSigningKey, DeviceKeys};
use ruma_common::encryption::CrossSigningKey;
use ruma_common::encryption::DeviceKeys;
use ruma_identifiers::{DeviceId, UserId}; use ruma_identifiers::{DeviceId, UserId};
use ruma_serde::Raw; use ruma_serde::Raw;
@ -32,12 +30,10 @@ ruma_api! {
pub device_keys: BTreeMap<Box<UserId>, BTreeMap<Box<DeviceId>, Raw<DeviceKeys>>>, pub device_keys: BTreeMap<Box<UserId>, BTreeMap<Box<DeviceId>, Raw<DeviceKeys>>>,
/// Information on the master cross-signing keys of the queried users. /// Information on the master cross-signing keys of the queried users.
#[cfg(feature = "unstable-pre-spec")]
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")] #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub master_keys: BTreeMap<Box<UserId>, Raw<CrossSigningKey>>, pub master_keys: BTreeMap<Box<UserId>, Raw<CrossSigningKey>>,
/// Information on the self-signing keys of the queried users. /// Information on the self-signing keys of the queried users.
#[cfg(feature = "unstable-pre-spec")]
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")] #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
pub self_signing_keys: BTreeMap<Box<UserId>, Raw<CrossSigningKey>>, pub self_signing_keys: BTreeMap<Box<UserId>, Raw<CrossSigningKey>>,
} }