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

client-api: sync::v5::Request::timeline_limit is not optional. (#1914)

Browse Source 
Contrary to MSC3575, MSC4186 has `timeline_limit` which is not optional.

This patch changes `timeline_limit: Option<UInt>` to `Int` directly.
This commit is contained in:
Ivan Enderlin 2024-09-27 08:17:02 +02:00 committed by GitHub
parent 463904db31
commit 85b412ffed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-client-api/src/sync/sync_events/v4.rs
View File

@ -980,7 +980,7 @@ impl From<v5::request::List> for SyncRequestList {
#[cfg(feature = "unstable-msc4186")] #[cfg(feature = "unstable-msc4186")]
impl From<v5::request::RoomDetails> for RoomDetailsConfig { impl From<v5::request::RoomDetails> for RoomDetailsConfig {
fn from(value: v5::request::RoomDetails) -> Self { fn from(value: v5::request::RoomDetails) -> Self {
Self { required_state: value.required_state, timeline_limit: value.timeline_limit } Self { required_state: value.required_state, timeline_limit: Some(value.timeline_limit) }
} }
} }
@ -1000,7 +1000,7 @@ impl From<v5::request::RoomSubscription> for RoomSubscription {
fn from(value: v5::request::RoomSubscription) -> Self { fn from(value: v5::request::RoomSubscription) -> Self {
Self { Self {
required_state: value.required_state, required_state: value.required_state,
timeline_limit: value.timeline_limit, timeline_limit: Some(value.timeline_limit),
include_heroes: value.include_heroes, include_heroes: value.include_heroes,
} }
} }

6
crates/ruma-client-api/src/sync/sync_events/v5.rs
View File

@ -154,8 +154,7 @@ pub mod request {
pub required_state: Vec<(StateEventType, String)>, pub required_state: Vec<(StateEventType, String)>,
/// The maximum number of timeline events to return per room. /// The maximum number of timeline events to return per room.
#[serde(skip_serializing_if = "Option::is_none")] pub timeline_limit: UInt,
pub timeline_limit: Option<UInt>,
/// Include the room heroes. /// Include the room heroes.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -171,8 +170,7 @@ pub mod request {
pub required_state: Vec<(StateEventType, String)>, pub required_state: Vec<(StateEventType, String)>,
/// The maximum number of timeline events to return per room. /// The maximum number of timeline events to return per room.
#[serde(skip_serializing_if = "Option::is_none")] pub timeline_limit: UInt,
pub timeline_limit: Option<UInt>,
} }
/// Sliding sync request extensions (see [`super::Request::extensions`]). /// Sliding sync request extensions (see [`super::Request::extensions`]).