Merge pull request #22 from tilpner/master

Pass sync endpoint parameters according to spec
This commit is contained in:
Jimmy Cuadra 2017-09-29 00:16:54 -07:00 committed by GitHub
commit 72e6dc7ad7

View File

@ -219,18 +219,23 @@ pub mod sync_events {
request { request {
/// A filter represented either as its full JSON definition or the ID of a saved filter. /// A filter represented either as its full JSON definition or the ID of a saved filter.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[ruma_api(query)]
pub filter: Option<Filter>, pub filter: Option<Filter>,
/// A point in time to continue a sync from. /// A point in time to continue a sync from.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[ruma_api(query)]
pub since: Option<String>, pub since: Option<String>,
/// Controls whether to include the full state for all rooms the user is a member of. /// Controls whether to include the full state for all rooms the user is a member of.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[ruma_api(query)]
pub full_state: Option<bool>, pub full_state: Option<bool>,
/// Controls whether the client is automatically marked as online by polling this API. /// Controls whether the client is automatically marked as online by polling this API.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[ruma_api(query)]
pub set_presence: Option<SetPresence>, pub set_presence: Option<SetPresence>,
/// The maximum time to poll in milliseconds before returning this request. /// The maximum time to poll in milliseconds before returning this request.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
#[ruma_api(query)]
pub timeout: Option<u64>, pub timeout: Option<u64>,
} }
@ -255,6 +260,7 @@ pub mod sync_events {
/// A filter represented either as its full JSON definition or the ID of a saved filter. /// A filter represented either as its full JSON definition or the ID of a saved filter.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(untagged)]
pub enum Filter { pub enum Filter {
/// A complete filter definition serialized to JSON. /// A complete filter definition serialized to JSON.
FilterDefinition(FilterDefinition), FilterDefinition(FilterDefinition),