diff --git a/Cargo.lock b/Cargo.lock
index bc4e22702eaac2ca4847ffba32ff0b690c96e2ad..c3dc2d841f48d2e27c2a3baba88cfb510a19d879 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2127,8 +2127,8 @@ dependencies = [
[[package]]
name = "ruma"
-version = "0.9.2"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+version = "0.9.4"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"assign",
"js_int",
@@ -2147,7 +2147,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"js_int",
"ruma-common",
@@ -2158,8 +2158,8 @@ dependencies = [
[[package]]
name = "ruma-client-api"
-version = "0.17.3"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+version = "0.17.4"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"assign",
"bytes",
@@ -2177,7 +2177,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.12.1"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"as_variant",
"base64",
@@ -2204,8 +2204,8 @@ dependencies = [
[[package]]
name = "ruma-events"
-version = "0.27.9"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+version = "0.27.11"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"as_variant",
"indexmap 2.0.0",
@@ -2227,7 +2227,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.8.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"js_int",
"ruma-common",
@@ -2239,7 +2239,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.9.3"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"js_int",
"thiserror",
@@ -2248,7 +2248,7 @@ dependencies = [
[[package]]
name = "ruma-identity-service-api"
version = "0.8.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"js_int",
"ruma-common",
@@ -2258,7 +2258,7 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.12.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"once_cell",
"proc-macro-crate",
@@ -2273,7 +2273,7 @@ dependencies = [
[[package]]
name = "ruma-push-gateway-api"
version = "0.8.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"js_int",
"ruma-common",
@@ -2285,7 +2285,7 @@ dependencies = [
[[package]]
name = "ruma-signatures"
version = "0.14.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"base64",
"ed25519-dalek",
@@ -2301,7 +2301,7 @@ dependencies = [
[[package]]
name = "ruma-state-res"
version = "0.10.0"
-source = "git+https://github.com/ruma/ruma?rev=5446ea979b314b90da1734f20efaff443d64f73d#5446ea979b314b90da1734f20efaff443d64f73d"
+source = "git+https://github.com/ruma/ruma?rev=9a5142052c808275f47613d4b66cb6c9fc286079#9a5142052c808275f47613d4b66cb6c9fc286079"
dependencies = [
"itertools",
"js_int",
diff --git a/Cargo.toml b/Cargo.toml
index 1e5886507dab91137ef6d3706d95d483d4216668..68fc44281b6b9b6ddfa0d132678e9343b5268f20 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ tower-http = { version = "0.4.4", features = ["add-extension", "cors", "sensitiv
# Used for matrix spec type definitions and helpers
#ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-ruma = { git = "https://github.com/ruma/ruma", rev = "5446ea979b314b90da1734f20efaff443d64f73d", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc3958", "unstable-msc2870", "unstable-msc3061", "unstable-extensible-events"] }
+ruma = { git = "https://github.com/ruma/ruma", rev = "9a5142052c808275f47613d4b66cb6c9fc286079", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-extensible-events"] }
#ruma = { git = "https://github.com/timokoesters/ruma", rev = "4ec9c69bb7e09391add2382b3ebac97b6e8f4c64", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
#ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 2259ab514f5ec21be09a64d262c026cbc1c49e70..1ac3ec73c7f22d5ec79d480a6cc2143286b4555a 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -1626,7 +1626,7 @@ pub async fn sync_events_v4_route(
Ordering::Less => None,
};
- let avatar = if heroes.len() == 1 {
+ let heroes_avatar = if heroes.len() == 1 {
heroes[0].1.clone()
} else {
None
@@ -1636,11 +1636,17 @@ pub async fn sync_events_v4_route(
room_id.clone(),
sync_events::v4::SlidingSyncRoom {
name: services().rooms.state_accessor.get_name(room_id)?.or(name),
- avatar: services()
- .rooms
- .state_accessor
- .get_avatar(room_id)?
- .map_or(avatar, |a| a.url),
+ avatar: if let Some(heroes_avatar) = heroes_avatar {
+ ruma::JsOption::Some(heroes_avatar)
+ } else {
+ match services().rooms.state_accessor.get_avatar(room_id)? {
+ ruma::JsOption::Some(avatar) => {
+ js_option::JsOption::Some(avatar.url.unwrap())
+ }
+ ruma::JsOption::Null => ruma::JsOption::Null,
+ ruma::JsOption::Undefined => ruma::JsOption::Undefined,
+ }
+ },
initial: Some(roomsince == &0),
is_dm: None,
invite_state: None,
diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs
index cf0eda834624554189fc5f4807eeee93d55da922..015e36986583fc8b1bd266a6bf03c01c8409fc3d 100644
--- a/src/service/pusher/mod.rs
+++ b/src/service/pusher/mod.rs
@@ -1,6 +1,6 @@
mod data;
pub use data::Data;
-use ruma::events::AnySyncTimelineEvent;
+use ruma::{events::AnySyncTimelineEvent, push::PushConditionPowerLevelsCtx};
use crate::{services, Error, PduEvent, Result};
use bytes::BytesMut;
@@ -192,6 +192,12 @@ pub fn get_actions<'a>(
pdu: &Raw<AnySyncTimelineEvent>,
room_id: &RoomId,
) -> Result<&'a [Action]> {
+ let power_levels = PushConditionPowerLevelsCtx {
+ users: power_levels.users.clone(),
+ users_default: power_levels.users_default,
+ notifications: power_levels.notifications.clone(),
+ };
+
let ctx = PushConditionRoomCtx {
room_id: room_id.to_owned(),
member_count: 10_u32.into(), // TODO: get member count efficiently
@@ -200,9 +206,7 @@ pub fn get_actions<'a>(
.users
.displayname(user)?
.unwrap_or_else(|| user.localpart().to_owned()),
- users_power_levels: power_levels.users.clone(),
- default_power_level: power_levels.users_default,
- notification_power_levels: power_levels.notifications.clone(),
+ power_levels: Some(power_levels),
};
Ok(ruleset.get_actions(pdu, &ctx))
diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs
index 14c3bae711e8040c173c05dd8d101d44ac722783..f49d8a3c22d6d263e9913770e8fa8abc540695c8 100644
--- a/src/service/rooms/state_accessor/mod.rs
+++ b/src/service/rooms/state_accessor/mod.rs
@@ -5,6 +5,7 @@
};
pub use data::Data;
+use js_option::JsOption;
use lru_cache::LruCache;
use ruma::{
events::{
@@ -290,12 +291,12 @@ pub fn get_name(&self, room_id: &RoomId) -> Result<Option<String>> {
})
}
- pub fn get_avatar(&self, room_id: &RoomId) -> Result<Option<RoomAvatarEventContent>> {
+ pub fn get_avatar(&self, room_id: &RoomId) -> Result<JsOption<RoomAvatarEventContent>> {
services()
.rooms
.state_accessor
.room_state_get(room_id, &StateEventType::RoomAvatar, "")?
- .map_or(Ok(None), |s| {
+ .map_or(Ok(JsOption::Undefined), |s| {
serde_json::from_str(s.content.get())
.map_err(|_| Error::bad_database("Invalid room avatar event in database."))
})