chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client-api: Use ruma_serde::Raw instead of RawJsonValue in get_state_events_for_key

Browse Source
This commit is contained in:
Jonas Platte 2021-04-18 12:44:13 +02:00
parent 9f815facc5
commit f11ba9ee15
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruma-client-api/src/r0/state/get_state_events_for_key.rs
View File

@ -1,10 +1,9 @@
//! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-state-eventtype-statekey) //! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-state-eventtype-statekey)
use ruma_api::ruma_api; use ruma_api::ruma_api;
use ruma_events::EventType; use ruma_events::{AnyStateEventContent, EventType};
use ruma_identifiers::RoomId; use ruma_identifiers::RoomId;
use ruma_serde::Outgoing; use ruma_serde::{Outgoing, Raw};
use serde_json::value::RawValue as RawJsonValue;
ruma_api! { ruma_api! {
metadata: { metadata: {
@ -18,8 +17,11 @@ ruma_api! {
response: { response: {
/// The content of the state event. /// The content of the state event.
///
/// Since the inner type of the `Raw` does not implement `Deserialize`, you need to use
/// `ruma_events::RawExt` to deserialize it.
#[ruma_api(body)] #[ruma_api(body)]
pub content: Box<RawJsonValue>, pub content: Raw<AnyStateEventContent>,
} }
error: crate::Error error: crate::Error
@ -51,7 +53,7 @@ impl<'a> Request<'a> {
impl Response { impl Response {
/// Creates a new `Response` with the given content. /// Creates a new `Response` with the given content.
pub fn new(content: Box<RawJsonValue>) -> Self { pub fn new(content: Raw<AnyStateEventContent>) -> Self {
Self { content } Self { content }
} }
} }
@ -76,8 +78,8 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
let mut url = format!( let mut url = format!(
"{}/_matrix/client/r0/rooms/{}/state/{}", "{}/_matrix/client/r0/rooms/{}/state/{}",
base_url.strip_suffix('/').unwrap_or(base_url), base_url.strip_suffix('/').unwrap_or(base_url),
utf8_percent_encode(&self.room_id.to_string(), NON_ALPHANUMERIC,), utf8_percent_encode(&self.room_id.to_string(), NON_ALPHANUMERIC),
utf8_percent_encode(&self.event_type.to_string(), NON_ALPHANUMERIC,) utf8_percent_encode(&self.event_type.to_string(), NON_ALPHANUMERIC)
); );
if !self.state_key.is_empty() { if !self.state_key.is_empty() {