Skip to content

Commit 26a8a17

Browse files
committed
chore: Update Ruma to add media caption methods.
1 parent 351fbf6 commit 26a8a17

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ once_cell = "1.16.0"
4747
pin-project-lite = "0.2.9"
4848
rand = "0.8.5"
4949
reqwest = { version = "0.12.4", default-features = false }
50-
ruma = { git = "https://github.com/ruma/ruma", rev = "1ae98db9c44f46a590f4c76baf5cef70ebb6970d", features = [
50+
ruma = { git = "https://github.com/ruma/ruma", rev = "b1c9a32f26f7aa76e20f96dbbb113250ed979112", features = [
5151
"client-api-c",
5252
"compat-upload-signatures",
5353
"compat-user-id",
@@ -61,7 +61,7 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "1ae98db9c44f46a590f4c76baf
6161
"unstable-msc4075",
6262
"unstable-msc4140",
6363
] }
64-
ruma-common = { git = "https://github.com/ruma/ruma", rev = "1ae98db9c44f46a590f4c76baf5cef70ebb6970d" }
64+
ruma-common = { git = "https://github.com/ruma/ruma", rev = "b1c9a32f26f7aa76e20f96dbbb113250ed979112" }
6565
serde = "1.0.151"
6666
serde_html_form = "0.2.0"
6767
serde_json = "1.0.91"
@@ -123,7 +123,7 @@ opt-level = 3
123123
async-compat = { git = "https://github.com/jplatte/async-compat", rev = "16dc8597ec09a6102d58d4e7b67714a35dd0ecb8" }
124124
const_panic = { git = "https://github.com/jplatte/const_panic", rev = "9024a4cb3eac45c1d2d980f17aaee287b17be498" }
125125
# Needed to fix rotation log issue on Android (https://github.com/tokio-rs/tracing/issues/2937)
126-
tracing = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd"}
126+
tracing = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }
127127
tracing-core = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }
128128
tracing-subscriber = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }
129129
tracing-appender = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }

bindings/matrix-sdk-ffi/src/room_list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ pub struct RequiredState {
716716
#[derive(uniffi::Record)]
717717
pub struct RoomSubscription {
718718
pub required_state: Option<Vec<RequiredState>>,
719-
pub timeline_limit: Option<u32>,
719+
pub timeline_limit: u32,
720720
pub include_heroes: Option<bool>,
721721
}
722722

@@ -726,7 +726,7 @@ impl From<RoomSubscription> for http::request::RoomSubscription {
726726
required_state: val.required_state.map(|r|
727727
r.into_iter().map(|s| (s.key.into(), s.value)).collect()
728728
).unwrap_or_default(),
729-
timeline_limit: val.timeline_limit.map(|u| u.into()),
729+
timeline_limit: val.timeline_limit.into(),
730730
include_heroes: val.include_heroes,
731731
})
732732
}

crates/matrix-sdk-ui/src/notification_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ impl NotificationClient {
425425
&[room_id],
426426
Some(assign!(http::request::RoomSubscription::default(), {
427427
required_state,
428-
timeline_limit: Some(uint!(16))
428+
timeline_limit: uint!(16)
429429
})),
430430
true,
431431
);

crates/matrix-sdk/src/sliding_sync/list/sticky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl StickyData for SlidingSyncListStickyParameters {
5050

5151
fn apply(&self, request: &mut Self::Request) {
5252
request.room_details.required_state = self.required_state.to_vec();
53-
request.room_details.timeline_limit = Some(self.timeline_limit.into());
53+
request.room_details.timeline_limit = self.timeline_limit.into();
5454
request.include_heroes = self.include_heroes;
5555
request.filters = self.filters.clone();
5656
}

0 commit comments

Comments
 (0)