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

Merge branch 'master' into membership-join-by-room-id

Browse Source
This commit is contained in:
Jimmy Cuadra 2016-12-15 01:13:49 -08:00 committed by GitHub
commit ec63bc01fe
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -11,11 +11,9 @@ repository = "https://github.com/ruma/ruma-client-api"
version = "0.1.0"
[dependencies]
ruma-identifiers = "0.4.3"
ruma-events = "0.1.0"
ruma-identifiers = "0.5.0"
ruma-signatures = "0.1.0"
serde = "0.8.19"
serde_derive = "0.8.19"
serde_json = "0.8.3"
[dependencies.ruma-events]
git = "https://github.com/ruma/ruma-events"
serde_json = "0.8.4"

11
src/r0/context.rs
View File

@ -3,7 +3,8 @@
/// GET /_matrix/client/r0/rooms/:room_id/context/:event_id
pub mod get_context {
use ruma_identifiers::{EventId, RoomId};
use ruma_events::{RoomEvent, StateEvent};
use ruma_events::collections::only;
/// Details about this API endpoint.
pub struct Endpoint;
@ -25,11 +26,11 @@ pub mod get_context {
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Response {
pub end: String,
pub event: Box<RoomEvent>,
pub events_after: Vec<Box<RoomEvent>>,
pub events_before: Vec<Box<RoomEvent>>,
pub event: only::RoomEvent,
pub events_after: Vec<only::RoomEvent>,
pub events_before: Vec<only::RoomEvent>,
pub start: String,
pub state: Vec<Box<StateEvent>>,
pub state: Vec<only::StateEvent>,
}
impl ::Endpoint for Endpoint {