mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-16 20:49:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(base): Propagate push rules deserialization errors

Browse Source 
… from BaseClient::get_push_rules.
This commit is contained in:
Jonas Platte
2022-03-25 14:48:43 +01:00
committed by Jonas Platte
parent 09893651a4
commit ed52cfc43c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/matrix-sdk-base/src/client.rs
View File

@@ -52,9 +52,9 @@ use ruma::{
use ruma::{
api::client::{self as api, push::get_notifications::v3::Notification},
events::{
room::member::MembershipState, AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent,
AnyStrippedStateEvent, AnySyncEphemeralRoomEvent, AnySyncRoomEvent, AnySyncStateEvent,
GlobalAccountDataEventType, StateEventType,
push_rules::PushRulesEvent, room::member::MembershipState, AnyGlobalAccountDataEvent,
AnyRoomAccountDataEvent, AnyStrippedStateEvent, AnySyncEphemeralRoomEvent,
AnySyncRoomEvent, AnySyncStateEvent, GlobalAccountDataEventType, StateEventType,
},
push::{Action, PushConditionRoomCtx, Ruleset},
serde::Raw,
@@ -1160,11 +1160,12 @@ impl BaseClient {
.and_then(|e| e.deserialize().ok())
{
Ok(event.content.global)
} else if let Some(AnyGlobalAccountDataEvent::PushRules(event)) = self
} else if let Some(event) = self
.store
.get_account_data_event(GlobalAccountDataEventType::PushRules)
.await?
.and_then(|e| e.deserialize().ok())
.map(|e| e.deserialize_as::<PushRulesEvent>())
.transpose()?
{
Ok(event.content.global)
} else if let Some(session) = self.get_session().await {