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

common: Merge ruma-identifiers into ruma-common

Browse Source
This commit is contained in:
Kévin Commaille 2022-03-09 18:46:51 +01:00 committed by GitHub
parent ac2d2f634d
commit 088d1872b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
309 changed files with 638 additions and 1151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/CODEOWNERS vendored
View File

@ -1,7 +1,6 @@
* @jplatte
/crates/ruma-common/ @iinuwa
/crates/ruma-federation-api/ @DevinR528
/crates/ruma-identifiers/ @iinuwa
/crates/ruma-identifiers-validation/ @iinuwa
/crates/ruma-identity-service-api/ @iinuwa
/crates/ruma-macros/ @ruma/macro-owners

1
crates/ruma-appservice-api/Cargo.toml
View File

@ -22,7 +22,6 @@ server = []
[dependencies]
ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", features = ["client"], optional = true }
ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api", "events"] }
ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" }
ruma-serde = { version = "0.6.0", path = "../ruma-serde" }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = "1.0.61"

7
crates/ruma-appservice-api/src/event/push_events.rs
View File

@ -7,8 +7,7 @@ pub mod v1 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixappv1transactionstxnid
use ruma_common::{api::ruma_api, events::AnyRoomEvent};
use ruma_identifiers::TransactionId;
use ruma_common::{api::ruma_api, events::AnyRoomEvent, TransactionId};
use ruma_serde::Raw;
ruma_api! {
@ -71,7 +70,7 @@ pub mod v1 {
next_batch: impl Into<String>,
) -> serde_json::Result<ruma_client_api::sync::sync_events::v3::Response> {
use ruma_client_api::sync::sync_events;
use ruma_identifiers::RoomId;
use ruma_common::RoomId;
use serde::Deserialize;
use tracing::warn;
@ -109,7 +108,7 @@ pub mod v1 {
#[cfg(test)]
mod helper_tests {
use ruma_client_api::sync::sync_events;
use ruma_identifiers::{room_id, TransactionId};
use ruma_common::{room_id, TransactionId};
use serde_json::{json, value::to_raw_value as to_raw_json_value};
use super::{IncomingRequest, Raw};

3
crates/ruma-appservice-api/src/query/query_room_alias.rs
View File

@ -7,8 +7,7 @@ pub mod v1 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1roomsroomalias
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomAliasId;
use ruma_common::{api::ruma_api, RoomAliasId};
ruma_api! {
metadata: {

3
crates/ruma-appservice-api/src/query/query_user_id.rs
View File

@ -7,8 +7,7 @@ pub mod v1 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1usersuserid
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
ruma_api! {
metadata: {

3
crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs vendored
View File

@ -7,8 +7,7 @@ pub mod v1 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartylocation
use ruma_common::{api::ruma_api, thirdparty::Location};
use ruma_identifiers::RoomAliasId;
use ruma_common::{api::ruma_api, thirdparty::Location, RoomAliasId};
ruma_api! {
metadata: {

3
crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs vendored
View File

@ -7,8 +7,7 @@ pub mod v1 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartyuser
use ruma_common::{api::ruma_api, thirdparty::User};
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, thirdparty::User, UserId};
ruma_api! {
metadata: {

1
crates/ruma-client-api/Cargo.toml
View File

@ -29,7 +29,6 @@ js_int = { version = "0.2.0", features = ["serde"] }
maplit = "1.0.2"
percent-encoding = "2.1.0"
ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api", "events"] }
ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" }
ruma-serde = { version = "0.6.0", path = "../ruma-serde" }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = "1.0.61"

3
crates/ruma-client-api/src/account/add_3pid.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidadd
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};

3
crates/ruma-client-api/src/account/bind_3pid.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidbind
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/register.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3register
use ruma_common::api::ruma_api;
use ruma_identifiers::{DeviceId, UserId};
use ruma_common::{api::ruma_api, DeviceId, UserId};
use super::{LoginType, RegistrationKind};
use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};

3
crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidemailrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidmsisdnrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/request_openid_token.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::time::Duration;
use ruma_common::{api::ruma_api, authentication::TokenType};
use ruma_identifiers::{ServerName, UserId};
use ruma_common::{api::ruma_api, authentication::TokenType, ServerName, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/account/request_password_change_token_via_email.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordemailrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordmsisdnrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/account/request_registration_token_via_email.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registeremailrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registermsisdnrequesttoken
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{ClientSecret, SessionId};
use ruma_common::{api::ruma_api, ClientSecret, SessionId};
use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};

3
crates/ruma-client-api/src/account/whoami.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3accountwhoami
use ruma_common::api::ruma_api;
use ruma_identifiers::{DeviceId, UserId};
use ruma_common::{api::ruma_api, DeviceId, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/alias/create_alias.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directoryroomroomalias
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomAliasId, RoomId};
use ruma_common::{api::ruma_api, RoomAliasId, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/alias/delete_alias.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3directoryroomroomalias
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomAliasId;
use ruma_common::{api::ruma_api, RoomAliasId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/alias/get_alias.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directoryroomroomalias
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomAliasId, RoomId, ServerName};
use ruma_common::{api::ruma_api, RoomAliasId, RoomId, ServerName};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/appservice/set_room_visibility.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixclientv3directorylistappservicenetworkidroomid
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::room::Visibility;

2
crates/ruma-client-api/src/backup.rs
View File

@ -18,7 +18,7 @@ pub mod update_backup_version;
use std::collections::BTreeMap;
use js_int::UInt;
use ruma_identifiers::{DeviceKeyId, UserId};
use ruma_common::{DeviceKeyId, UserId};
use ruma_serde::{Base64, Raw};
use serde::{Deserialize, Serialize};

3
crates/ruma-client-api/src/backup/add_backup_keys.rs
View File

@ -8,8 +8,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::backup::RoomKeyBackup;

3
crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs
View File

@ -8,8 +8,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use ruma_serde::Raw;
use crate::backup::KeyBackupData;

3
crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3room_keyskeysroomidsessionid
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use ruma_serde::Raw;
use crate::backup::KeyBackupData;

3
crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomid
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomidsessionid
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/backup/get_backup_keys.rs
View File

@ -9,8 +9,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::backup::RoomKeyBackup;

3
crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use ruma_serde::Raw;
use crate::backup::KeyBackupData;

3
crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3room_keyskeysroomidsessionid
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use ruma_serde::Raw;
use crate::backup::KeyBackupData;

2
crates/ruma-client-api/src/capabilities.rs
View File

@ -3,7 +3,7 @@
use std::{borrow::Cow, collections::BTreeMap};
use maplit::btreemap;
use ruma_identifiers::RoomVersionId;
use ruma_common::RoomVersionId;
use ruma_serde::StringEnum;
use serde::{Deserialize, Serialize};
use serde_json::{from_value as from_json_value, to_value as to_json_value, Value as JsonValue};

3
crates/ruma-client-api/src/config/get_global_account_data.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridaccount_datatype
use ruma_common::{api::ruma_api, events::AnyGlobalAccountDataEventContent};
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, events::AnyGlobalAccountDataEventContent, UserId};
use ruma_serde::Raw;
ruma_api! {

3
crates/ruma-client-api/src/config/get_room_account_data.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridroomsroomidaccount_datatype
use ruma_common::{api::ruma_api, events::AnyRoomAccountDataEventContent};
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{api::ruma_api, events::AnyRoomAccountDataEventContent, RoomId, UserId};
use ruma_serde::Raw;
ruma_api! {

2
crates/ruma-client-api/src/config/set_global_account_data.rs
View File

@ -8,8 +8,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyGlobalAccountDataEventContent, GlobalAccountDataEventContent},
UserId,
};
use ruma_identifiers::UserId;
use ruma_serde::Raw;
use serde_json::value::to_raw_value as to_raw_json_value;

2
crates/ruma-client-api/src/config/set_room_account_data.rs
View File

@ -8,8 +8,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyRoomAccountDataEventContent, RoomAccountDataEventContent},
RoomId, UserId,
};
use ruma_identifiers::{RoomId, UserId};
use ruma_serde::Raw;
use serde_json::value::to_raw_value as to_raw_json_value;

2
crates/ruma-client-api/src/context/get_context.rs
View File

@ -9,8 +9,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyRoomEvent, AnyStateEvent},
EventId, RoomId,
};
use ruma_identifiers::{EventId, RoomId};
use ruma_serde::Raw;
use crate::filter::{IncomingRoomEventFilter, RoomEventFilter};

3
crates/ruma-client-api/src/device.rs
View File

@ -1,7 +1,6 @@
//! Endpoints for managing devices.
use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_identifiers::DeviceId;
use ruma_common::{DeviceId, MilliSecondsSinceUnixEpoch};
use serde::{Deserialize, Serialize};
pub mod delete_device;

3
crates/ruma-client-api/src/device/delete_device.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3devicesdeviceid
use ruma_common::api::ruma_api;
use ruma_identifiers::DeviceId;
use ruma_common::{api::ruma_api, DeviceId};
use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};

3
crates/ruma-client-api/src/device/delete_devices.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3delete_devices
use ruma_common::api::ruma_api;
use ruma_identifiers::DeviceId;
use ruma_common::{api::ruma_api, DeviceId};
use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};

3
crates/ruma-client-api/src/device/get_device.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3devicesdeviceid
use ruma_common::api::ruma_api;
use ruma_identifiers::DeviceId;
use ruma_common::{api::ruma_api, DeviceId};
use crate::device::Device;

3
crates/ruma-client-api/src/device/update_device.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3devicesdeviceid
use ruma_common::api::ruma_api;
use ruma_identifiers::DeviceId;
use ruma_common::{api::ruma_api, DeviceId};
ruma_api! {
metadata: {

9
crates/ruma-client-api/src/directory/get_public_rooms.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3publicrooms
use js_int::UInt;
use ruma_common::{api::ruma_api, directory::PublicRoomsChunk};
use ruma_identifiers::ServerName;
use ruma_common::{api::ruma_api, directory::PublicRoomsChunk, ServerName};
ruma_api! {
metadata: {
@ -82,8 +81,10 @@ pub mod v3 {
#[cfg(feature = "client")]
#[test]
fn construct_request_from_refs() {
use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken};
use ruma_identifiers::server_name;
use ruma_common::{
api::{MatrixVersion, OutgoingRequest as _, SendAccessToken},
server_name,
};
let req = super::Request {
limit: Some(uint!(10)),

2
crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs
View File

@ -9,8 +9,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork},
ServerName,
};
use ruma_identifiers::ServerName;
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/directory/get_room_visibility.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directorylistroomroomid
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::room::Visibility;

3
crates/ruma-client-api/src/directory/set_room_visibility.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directorylistroomroomid
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::room::Visibility;

6
crates/ruma-client-api/src/error.rs
View File

@ -3,11 +3,13 @@
use std::{collections::BTreeMap, fmt, time::Duration};
use bytes::BufMut;
use ruma_common::api::{
use ruma_common::{
api::{
error::{DeserializationError, IntoHttpError},
EndpointError, OutgoingResponse,
},
RoomVersionId,
};
use ruma_identifiers::RoomVersionId;
use serde::{Deserialize, Serialize};
use serde_json::{from_slice as from_json_slice, Value as JsonValue};

2
crates/ruma-client-api/src/error/kind_serde.rs
View File

@ -296,7 +296,7 @@ impl Serialize for ErrorKind {
#[cfg(test)]
mod tests {
use ruma_identifiers::room_version_id;
use ruma_common::room_version_id;
use serde_json::{from_value as from_json_value, json};
use super::ErrorKind;

2
crates/ruma-client-api/src/filter.rs
View File

@ -7,7 +7,7 @@ mod lazy_load;
mod url;
use js_int::UInt;
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{RoomId, UserId};
use ruma_serde::{Outgoing, StringEnum};
use serde::Serialize;

9
crates/ruma-client-api/src/filter/create_filter.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3useruseridfilter
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
use crate::filter::{FilterDefinition, IncomingFilterDefinition};
@ -84,8 +83,10 @@ pub mod v3 {
#[cfg(feature = "client")]
#[test]
fn serialize_request() {
use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken};
use ruma_identifiers::user_id;
use ruma_common::{
api::{MatrixVersion, OutgoingRequest, SendAccessToken},
user_id,
};
use crate::filter::FilterDefinition;

3
crates/ruma-client-api/src/filter/get_filter.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridfilterfilterid
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
use crate::filter::IncomingFilterDefinition;

5
crates/ruma-client-api/src/keys/claim_keys.rs
View File

@ -7,8 +7,9 @@ pub mod v3 {
use std::{collections::BTreeMap, time::Duration};
use ruma_common::{api::ruma_api, encryption::OneTimeKey};
use ruma_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId};
use ruma_common::{
api::ruma_api, encryption::OneTimeKey, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId,
};
use ruma_serde::Raw;
use serde_json::Value as JsonValue;

3
crates/ruma-client-api/src/keys/get_key_changes.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3keyschanges
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
ruma_api! {
metadata: {

2
crates/ruma-client-api/src/keys/get_keys.rs
View File

@ -10,8 +10,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
encryption::{CrossSigningKey, DeviceKeys},
DeviceId, UserId,
};
use ruma_identifiers::{DeviceId, UserId};
use ruma_serde::Raw;
use serde_json::Value as JsonValue;

2
crates/ruma-client-api/src/keys/upload_keys.rs
View File

@ -11,8 +11,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
encryption::{DeviceKeys, OneTimeKey},
DeviceKeyAlgorithm, DeviceKeyId,
};
use ruma_identifiers::{DeviceKeyAlgorithm, DeviceKeyId};
use ruma_serde::Raw;
ruma_api! {

2
crates/ruma-client-api/src/keys/upload_signatures.rs
View File

@ -10,8 +10,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
encryption::{CrossSigningKey, DeviceKeys},
DeviceId, UserId,
};
use ruma_identifiers::{DeviceId, UserId};
use ruma_serde::{Raw, StringEnum};
use serde::{Deserialize, Serialize};
use serde_json::value::RawValue as RawJsonValue;

3
crates/ruma-client-api/src/knock/knock_room.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3knockroomidoralias
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName};
use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/media/create_content.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixmediav3upload
use ruma_common::api::ruma_api;
use ruma_identifiers::MxcUri;
use ruma_common::{api::ruma_api, MxcUri};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/media/get_content.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaid
use ruma_common::api::ruma_api;
use ruma_identifiers::{Error, MxcUri, ServerName};
use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/media/get_content_as_filename.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaidfilename
use ruma_common::api::ruma_api;
use ruma_identifiers::{Error, MxcUri, ServerName};
use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/media/get_content_thumbnail.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3thumbnailservernamemediaid
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::{Error, MxcUri, ServerName};
use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
use ruma_serde::StringEnum;
use crate::PrivOwnedStr;

3
crates/ruma-client-api/src/membership.rs
View File

@ -14,8 +14,7 @@ pub mod unban_user;
use std::collections::BTreeMap;
use ruma_common::thirdparty::Medium;
use ruma_identifiers::{ServerName, ServerSigningKeyId, UserId};
use ruma_common::{thirdparty::Medium, ServerName, ServerSigningKeyId, UserId};
use ruma_serde::Outgoing;
use serde::Serialize;

3
crates/ruma-client-api/src/membership/ban_user.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidban
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{api::ruma_api, RoomId, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/membership/forget_room.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidforget
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/membership/get_member_events.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidmembers
use ruma_common::{api::ruma_api, events::room::member::RoomMemberEvent};
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, events::room::member::RoomMemberEvent, RoomId};
use ruma_serde::{Raw, StringEnum};
use crate::PrivOwnedStr;

6
crates/ruma-client-api/src/membership/invite_user.rs
View File

@ -10,8 +10,7 @@ pub mod v3 {
//! [spec-mxid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite
//! [spec-3pid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite-1
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{api::ruma_api, RoomId, UserId};
use ruma_serde::Outgoing;
use serde::Serialize;
@ -81,8 +80,7 @@ pub mod v3 {
#[cfg(test)]
mod tests {
use ruma_common::thirdparty::Medium;
use ruma_identifiers::user_id;
use ruma_common::{thirdparty::Medium, user_id};
use serde_json::{from_value as from_json_value, json};
use super::IncomingInvitationRecipient;

3
crates/ruma-client-api/src/membership/join_room_by_id.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidjoin
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned};

3
crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3joinroomidoralias
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName};
use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName};
use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned};

3
crates/ruma-client-api/src/membership/joined_members.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use ruma_common::api::ruma_api;
use ruma_identifiers::{MxcUri, RoomId, UserId};
use ruma_common::{api::ruma_api, MxcUri, RoomId, UserId};
use serde::{Deserialize, Serialize};
ruma_api! {

3
crates/ruma-client-api/src/membership/joined_rooms.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3joined_rooms
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/membership/kick_user.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidkick
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{api::ruma_api, RoomId, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/membership/leave_room.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidleave
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/membership/unban_user.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidunban
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, UserId};
use ruma_common::{api::ruma_api, RoomId, UserId};
ruma_api! {
metadata: {

8
crates/ruma-client-api/src/message/get_message_events.rs
View File

@ -9,8 +9,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyRoomEvent, AnyStateEvent},
RoomId,
};
use ruma_identifiers::RoomId;
use ruma_serde::Raw;
use serde::{Deserialize, Serialize};
@ -152,8 +152,10 @@ pub mod v3 {
#[cfg(all(test, feature = "client"))]
mod tests {
use js_int::uint;
use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken};
use ruma_identifiers::room_id;
use ruma_common::{
api::{MatrixVersion, OutgoingRequest, SendAccessToken},
room_id,
};
use super::{Direction, Request};
use crate::filter::{LazyLoadOptions, RoomEventFilter};

2
crates/ruma-client-api/src/message/send_message_event.rs
View File

@ -8,8 +8,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyMessageLikeEventContent, MessageLikeEventContent},
EventId, RoomId, TransactionId,
};
use ruma_identifiers::{EventId, RoomId, TransactionId};
use ruma_serde::Raw;
use serde_json::value::to_raw_value as to_raw_json_value;

3
crates/ruma-client-api/src/presence/get_presence.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::time::Duration;
use ruma_common::{api::ruma_api, presence::PresenceState};
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, presence::PresenceState, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/presence/set_presence.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3presenceuseridstatus
use ruma_common::{api::ruma_api, presence::PresenceState};
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, presence::PresenceState, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/profile/get_avatar_url.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseridavatar_url
use ruma_common::api::ruma_api;
use ruma_identifiers::{MxcUri, UserId};
use ruma_common::{api::ruma_api, MxcUri, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/profile/get_display_name.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseriddisplayname
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/profile/get_profile.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuserid
use ruma_common::api::ruma_api;
use ruma_identifiers::{MxcUri, UserId};
use ruma_common::{api::ruma_api, MxcUri, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/profile/set_avatar_url.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseridavatar_url
use ruma_common::api::ruma_api;
use ruma_identifiers::{MxcUri, UserId};
use ruma_common::{api::ruma_api, MxcUri, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/profile/set_display_name.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseriddisplayname
use ruma_common::api::ruma_api;
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, UserId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/push/get_notifications.rs
View File

@ -7,9 +7,8 @@ pub mod v3 {
use js_int::UInt;
use ruma_common::{
api::ruma_api, events::AnySyncRoomEvent, push::Action, MilliSecondsSinceUnixEpoch,
api::ruma_api, events::AnySyncRoomEvent, push::Action, MilliSecondsSinceUnixEpoch, RoomId,
};
use ruma_identifiers::RoomId;
use ruma_serde::Raw;
use serde::{Deserialize, Serialize};

3
crates/ruma-client-api/src/read_marker/set_read_marker.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidread_markers
use ruma_common::api::ruma_api;
use ruma_identifiers::{EventId, RoomId};
use ruma_common::{api::ruma_api, EventId, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/receipt/create_receipt.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreceiptreceipttypeeventid
use ruma_common::{api::ruma_api, receipt::ReceiptType};
use ruma_identifiers::{EventId, RoomId};
use ruma_common::{api::ruma_api, receipt::ReceiptType, EventId, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/redact/redact_event.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3roomsroomidredacteventidtxnid
use ruma_common::api::ruma_api;
use ruma_identifiers::{EventId, RoomId, TransactionId};
use ruma_common::{api::ruma_api, EventId, RoomId, TransactionId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/room/aliases.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidaliases
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomAliasId, RoomId};
use ruma_common::{api::ruma_api, RoomAliasId, RoomId};
ruma_api! {
metadata: {

2
crates/ruma-client-api/src/room/create_room.rs
View File

@ -16,8 +16,8 @@ pub mod v3 {
AnyInitialStateEvent,
},
room::RoomType,
RoomId, RoomName, RoomVersionId, UserId,
};
use ruma_identifiers::{RoomId, RoomName, RoomVersionId, UserId};
use ruma_serde::{Raw, StringEnum};
use serde::{Deserialize, Serialize};

3
crates/ruma-client-api/src/room/get_room_event.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomideventeventid
use ruma_common::{api::ruma_api, events::AnyRoomEvent};
use ruma_identifiers::{EventId, RoomId};
use ruma_common::{api::ruma_api, events::AnyRoomEvent, EventId, RoomId};
use ruma_serde::Raw;
ruma_api! {

3
crates/ruma-client-api/src/room/report_content.rs
View File

@ -6,8 +6,7 @@ pub mod v3 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreporteventid
use js_int::Int;
use ruma_common::api::ruma_api;
use ruma_identifiers::{EventId, RoomId};
use ruma_common::{api::ruma_api, EventId, RoomId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/room/upgrade_room.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidupgrade
use ruma_common::api::ruma_api;
use ruma_identifiers::{RoomId, RoomVersionId};
use ruma_common::{api::ruma_api, RoomId, RoomVersionId};
ruma_api! {
metadata: {

2
crates/ruma-client-api/src/search/search_events.rs
View File

@ -11,8 +11,8 @@ pub mod v3 {
use ruma_common::{
api::ruma_api,
events::{AnyRoomEvent, AnyStateEvent},
EventId, MxcUri, RoomId, UserId,
};
use ruma_identifiers::{EventId, MxcUri, RoomId, UserId};
use ruma_serde::{Outgoing, Raw, StringEnum};
use serde::{Deserialize, Serialize};

3
crates/ruma-client-api/src/server/get_user_info.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::collections::BTreeMap;
use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch};
use ruma_identifiers::UserId;
use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch, UserId};
use serde::{Deserialize, Serialize};
ruma_api! {

3
crates/ruma-client-api/src/session/get_login_types.rs
View File

@ -7,8 +7,7 @@ pub mod v3 {
use std::borrow::Cow;
use ruma_common::api::ruma_api;
use ruma_identifiers::MxcUri;
use ruma_common::{api::ruma_api, MxcUri};
use ruma_serde::{JsonObject, StringEnum};
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_json::Value as JsonValue;

3
crates/ruma-client-api/src/session/login.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3login
use ruma_common::api::ruma_api;
use ruma_identifiers::{DeviceId, ServerName, UserId};
use ruma_common::{api::ruma_api, DeviceId, ServerName, UserId};
use ruma_serde::{JsonObject, Outgoing};
use serde::{
de::{self, DeserializeOwned},

3
crates/ruma-client-api/src/session/login_fallback.rs
View File

@ -2,8 +2,7 @@
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#login-fallback
use ruma_common::api::ruma_api;
use ruma_identifiers::DeviceId;
use ruma_common::{api::ruma_api, DeviceId};
ruma_api! {
metadata: {

3
crates/ruma-client-api/src/space.rs
View File

@ -3,9 +3,8 @@
use js_int::UInt;
use ruma_common::{
directory::PublicRoomJoinRule, events::space::child::HierarchySpaceChildStateEvent,
room::RoomType,
room::RoomType, MxcUri, RoomAliasId, RoomId, RoomName,
};
use ruma_identifiers::{MxcUri, RoomAliasId, RoomId, RoomName};
use ruma_serde::Raw;
use serde::{Deserialize, Serialize};

3
crates/ruma-client-api/src/space/get_hierarchy.rs
View File

@ -6,8 +6,7 @@ pub mod v1 {
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv1roomsroomidhierarchy
use js_int::UInt;
use ruma_common::api::ruma_api;
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, RoomId};
use crate::space::SpaceHierarchyRoomsChunk;

3
crates/ruma-client-api/src/state/get_state_events.rs
View File

@ -5,8 +5,7 @@ pub mod v3 {
//!
//! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidstate
use ruma_common::{api::ruma_api, events::AnyStateEvent};
use ruma_identifiers::RoomId;
use ruma_common::{api::ruma_api, events::AnyStateEvent, RoomId};
use ruma_serde::Raw;
ruma_api! {

Some files were not shown because too many files have changed in this diff Show More