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

Fix search::search_events event types

Browse Source
This commit is contained in:
Timo 2020-08-18 13:01:43 +02:00 committed by Jonas Platte
parent 58abd51d1e
commit 6aba097b10
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruma-client-api/CHANGELOG.md
View File

@ -58,6 +58,7 @@ Breaking changes:
the `ruma-common` crate the `ruma-common` crate
* Replace `r0::room::create_room::InitialStateEvent` with `ruma_events::InitialStateEvent` * Replace `r0::room::create_room::InitialStateEvent` with `ruma_events::InitialStateEvent`
* `error::ErrorKind` no longer implements `Copy`, `FromStr` * `error::ErrorKind` no longer implements `Copy`, `FromStr`
* Switch from `AnyEvent` to `AnyRoomEvent` in `r0::search::search_events`
Improvements: Improvements:

8
ruma-client-api/src/r0/search/search_events.rs
View File

@ -5,7 +5,7 @@ use std::collections::BTreeMap;
use js_int::{uint, UInt}; use js_int::{uint, UInt};
use ruma_api::{ruma_api, Outgoing}; use ruma_api::{ruma_api, Outgoing};
use ruma_common::Raw; use ruma_common::Raw;
use ruma_events::{AnyEvent, AnyStateEvent}; use ruma_events::{AnyRoomEvent, AnyStateEvent};
use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_identifiers::{EventId, RoomId, UserId};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -186,11 +186,11 @@ pub struct EventContextResult {
/// Events just after the result. /// Events just after the result.
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub events_after: Vec<Raw<AnyEvent>>, pub events_after: Vec<Raw<AnyRoomEvent>>,
/// Events just before the result. /// Events just before the result.
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub events_before: Vec<Raw<AnyEvent>>, pub events_before: Vec<Raw<AnyRoomEvent>>,
/// The historic profile information of the users that sent the events returned. /// The historic profile information of the users that sent the events returned.
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")] #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
@ -411,7 +411,7 @@ pub struct SearchResult {
/// The event that matched. /// The event that matched.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub result: Option<Raw<AnyEvent>>, pub result: Option<Raw<AnyRoomEvent>>,
} }
impl SearchResult { impl SearchResult {