crappyrules
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Refactor account_data to be more similar to other endpoints

ruma
Devin Ragotzy 6 years ago
parent
60381ddcf4
commit
87fd432527
1 changed files with 8 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/client_server.rs

15
src/client_server.rs
Unescape View File

@ -589,18 +589,19 @@ pub fn get_global_account_data_route(
) -> ConduitResult<get_global_account_data::Response> { ) -> ConduitResult<get_global_account_data::Response> {
let user_id = body.user_id.as_ref().expect("user is authenticated"); let user_id = body.user_id.as_ref().expect("user is authenticated");
db.account_data let event = db
.account_data
.get( .get(
None, None,
user_id, user_id,
&EventType::try_from(&body.event_type).expect("EventType::try_from can never fail"), &EventType::try_from(&body.event_type).expect("EventType::try_from can never fail"),
)? )?
.and_then(|ev| { .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
serde_json::from_str(ev.json().get())
.map(|data| get_global_account_data::Response { account_data: data }.into()) let data = serde_json::from_str(event.json().get())
.ok() .map_err(|_| Error::bad_database("Invalid account data event in db."))?;
})
.ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found.")) Ok(get_global_account_data::Response { account_data: data }.into())
} }
#[put("/_matrix/client/r0/profile/<_user_id>/displayname", data = "<body>")] #[put("/_matrix/client/r0/profile/<_user_id>/displayname", data = "<body>")]

Write Preview
Loading…
Cancel
Save