TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont 404 and respond+update with default push rules if non-existent

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-05 20:13:23 -04:00 • committed by June
parent e4a987cf80
commit 2516d44cb1
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/api/client_server/push.rs
View file

@ -7,12 +7,12 @@ use ruma::{
}, },
}, },
events::{push_rules::PushRulesEvent, GlobalAccountDataEventType}, events::{push_rules::PushRulesEvent, GlobalAccountDataEventType},
push::{InsertPushRuleError, RemovePushRuleError}, push::{InsertPushRuleError, RemovePushRuleError, Ruleset},
}; };
use crate::{services, Error, Result, Ruma}; use crate::{services, Error, Result, Ruma};
/// # `GET /_matrix/client/r0/pushrules` /// # `GET /_matrix/client/r0/pushrules/`
/// ///
/// Retrieves the push rules event for this user. /// Retrieves the push rules event for this user.
pub async fn get_pushrules_all_route( pub async fn get_pushrules_all_route(
@ -20,18 +20,36 @@ pub async fn get_pushrules_all_route(
) -> Result<get_pushrules_all::v3::Response> { ) -> Result<get_pushrules_all::v3::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated"); let sender_user = body.sender_user.as_ref().expect("user is authenticated");
let event = services() let event =
.account_data services()
.get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())? .account_data
.ok_or(Error::BadRequest(ErrorKind::NotFound, "PushRules event not found."))?; .get(None, sender_user, GlobalAccountDataEventType::PushRules.to_string().into())?;
let account_data = serde_json::from_str::<PushRulesEvent>(event.get()) if let Some(event) = event {
.map_err(|_| Error::bad_database("Invalid account data event in db."))? let account_data = serde_json::from_str::<PushRulesEvent>(event.get())
.content; .map_err(|_| Error::bad_database("Invalid account data event in db."))?
.content;
Ok(get_pushrules_all::v3::Response { Ok(get_pushrules_all::v3::Response {
global: account_data.global, global: account_data.global,
}) })
} else {
services().account_data.update(
None,
sender_user,
GlobalAccountDataEventType::PushRules.to_string().into(),
&serde_json::to_value(PushRulesEvent {
content: ruma::events::push_rules::PushRulesEventContent {
global: Ruleset::server_default(sender_user),
},
})
.expect("to json always works"),
)?;
Ok(get_pushrules_all::v3::Response {
global: Ruleset::server_default(sender_user),
})
}
} }
/// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}` /// # `GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}`