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

Convert m.room.member to the new API. Remove dependency on

Browse Source 
ruma-signatures.
This commit is contained in:
Jimmy Cuadra 2019-07-13 04:04:13 -07:00
parent 596fc3c3df
commit d5b38354d0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -15,7 +15,6 @@ edition = "2018"
[dependencies] [dependencies]
ruma-identifiers = "0.13.0" ruma-identifiers = "0.13.0"
ruma-events-macros = { path = "../ruma-events-macros" } ruma-events-macros = { path = "../ruma-events-macros" }
ruma-signatures = "0.4.2"
serde_json = "1.0.39" serde_json = "1.0.39"
[dependencies.js_int] [dependencies.js_int]

2
src/room.rs
View File

@ -16,7 +16,7 @@ pub mod encryption;
pub mod guest_access; pub mod guest_access;
pub mod history_visibility; pub mod history_visibility;
pub mod join_rules; pub mod join_rules;
// pub mod member; pub mod member;
pub mod message; pub mod message;
pub mod name; pub mod name;
pub mod pinned_events; pub mod pinned_events;

13
src/room/member.rs
View File

@ -1,9 +1,10 @@
//! Types for the *m.room.member* event. //! Types for the *m.room.member* event.
use std::collections::HashMap;
use js_int::UInt; use js_int::UInt;
use ruma_events_macros::ruma_event; use ruma_events_macros::ruma_event;
use ruma_identifiers::UserId; use ruma_identifiers::UserId;
use ruma_signatures::Signatures;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
ruma_event! { ruma_event! {
@ -22,8 +23,8 @@ ruma_event! {
/// present, this contains an array of `StrippedState` events. These events provide information /// present, this contains an array of `StrippedState` events. These events provide information
/// on a subset of state events such as the room name. Note that ruma-events treats unsigned /// on a subset of state events such as the room name. Note that ruma-events treats unsigned
/// data on events as arbitrary JSON values, and the ruma-events types for this event don't /// data on events as arbitrary JSON values, and the ruma-events types for this event don't
/// provide direct access to these `invite_room_state`. If you need this data, you must extract /// provide direct access to `invite_room_state`. If you need this data, you must extract and
/// and convert it from a `serde_json::Value` yourself. /// convert it from a `serde_json::Value` yourself.
/// ///
/// The user for which a membership applies is represented by the `state_key`. Under some /// The user for which a membership applies is represented by the `state_key`. Under some
/// conditions, the `sender` and `state_key` may not match - this may be interpreted as the /// conditions, the `sender` and `state_key` may not match - this may be interpreted as the
@ -101,7 +102,7 @@ impl_enum! {
} }
/// Information about a third party invitation. /// Information about a third party invitation.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
pub struct ThirdPartyInvite { pub struct ThirdPartyInvite {
/// A name which can be displayed to represent the user instead of their third party /// A name which can be displayed to represent the user instead of their third party
/// identifier. /// identifier.
@ -114,7 +115,7 @@ pub struct ThirdPartyInvite {
/// A block of content which has been signed, which servers can use to verify a third party /// A block of content which has been signed, which servers can use to verify a third party
/// invitation. /// invitation.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
pub struct SignedContent { pub struct SignedContent {
/// The invited Matrix user ID. /// The invited Matrix user ID.
/// ///
@ -123,7 +124,7 @@ pub struct SignedContent {
/// A single signature from the verifying server, in the format specified by the Signing Events /// A single signature from the verifying server, in the format specified by the Signing Events
/// section of the server-server API. /// section of the server-server API.
pub signatures: Signatures, pub signatures: HashMap<String, HashMap<String, String>>,
/// The token property of the containing third_party_invite object. /// The token property of the containing third_party_invite object.
pub token: String, pub token: String,