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

update type of limited in r0::sync::sync_events::Timeline from Option<bool> to bool

Browse Source
This commit is contained in:
skim 2020-07-13 13:59:16 -07:00
parent 1db4898cde
commit 7b909efccc
No known key found for this signature in database
GPG Key ID: C34FAB15A47E38FA
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruma-client-api/CHANGELOG.md
View File

@ -19,6 +19,7 @@ Breaking changes:
* Fix event types in `r0::context::get_context`
* Fix event types in `r0::sync::sync_events`
* Update type of `user_id` in `r0::account::whoami` from `String` to `ruma_identifiers::UserId`
* Update type of `limited` in `r0::sync::sync_events::Timeline` from `Option<bool>` to `bool`
Improvements:

35
ruma-client-api/src/r0/sync/sync_events.rs
View File

@ -233,8 +233,8 @@ impl UnreadNotificationsCount {
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Timeline {
/// True if the number of events returned was limited by the `limit` on the filter.
#[serde(skip_serializing_if = "Option::is_none")]
pub limited: Option<bool>,
#[serde(default, skip_serializing_if = "ruma_serde::is_default")]
pub limited: bool,
/// A token that can be supplied to to the `from` parameter of the
/// `/rooms/{roomId}/messages` endpoint.
@ -406,9 +406,11 @@ impl DeviceLists {
mod tests {
use std::{convert::TryInto, time::Duration};
use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
use matches::assert_matches;
use super::{Filter, PresenceState, Request};
use super::{Filter, PresenceState, Request, Timeline};
#[test]
fn serialize_all_params() {
@ -500,4 +502,31 @@ mod tests {
assert_eq!(req.set_presence, PresenceState::Online);
assert_eq!(req.timeout, Some(Duration::from_millis(0)));
}
#[test]
fn timeline_serde() {
let timeline = Timeline { limited: true, prev_batch: None, events: vec![] };
let timeline_serialized = json!({
"limited": true,
"events": []
});
assert_eq!(to_json_value(timeline).unwrap(), timeline_serialized);
let timeline_deserialized: Timeline = from_json_value(timeline_serialized).unwrap();
assert_eq!(timeline_deserialized.limited, true);
let timeline_default = Timeline { limited: false, prev_batch: None, events: vec![] };
let timeline_default_serialized = json!({
"events": []
});
assert_eq!(to_json_value(timeline_default).unwrap(), timeline_default_serialized);
let timeline_default_deserialized: Timeline =
from_json_value(timeline_default_serialized).unwrap();
assert_eq!(timeline_default_deserialized.limited, false);
}
}