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

Add AnyEphemeralRoomEventStub and use it in sync response

Browse Source
This commit is contained in:
Ragotzy.devin 2020-06-25 07:19:39 -04:00 committed by GitHub
parent 567cfea7ac
commit 928fe6ce26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruma-client-api/src/r0/sync/sync_events.rs
View File

@ -6,7 +6,7 @@ use js_int::UInt;
use ruma_api::ruma_api; use ruma_api::ruma_api;
use ruma_common::presence::PresenceState; use ruma_common::presence::PresenceState;
use ruma_events::{ use ruma_events::{
presence::PresenceEvent, AnyBasicEvent, AnyEphemeralRoomEvent, AnyRoomEventStub, presence::PresenceEvent, AnyBasicEvent, AnyEphemeralRoomEventStub, AnyRoomEventStub,
AnyStateEventStub, AnyStrippedStateEventStub, AnyToDeviceEvent, EventJson, AnyStateEventStub, AnyStrippedStateEventStub, AnyToDeviceEvent, EventJson,
}; };
use ruma_identifiers::{RoomId, UserId}; use ruma_identifiers::{RoomId, UserId};
@ -284,7 +284,7 @@ impl AccountData {
#[derive(Clone, Debug, Default, Deserialize, Serialize)] #[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Ephemeral { pub struct Ephemeral {
/// A list of events. /// A list of events.
pub events: Vec<EventJson<AnyEphemeralRoomEvent>>, pub events: Vec<EventJson<AnyEphemeralRoomEventStub>>,
} }
impl Ephemeral { impl Ephemeral {

3
ruma-events-macros/src/event_enum.rs
View File

@ -19,7 +19,8 @@ pub fn expand_event_enum(input: EventEnumInput) -> syn::Result<TokenStream> {
|| ident == "AnyEphemeralRoomEvent" || ident == "AnyEphemeralRoomEvent"
|| ident == "AnyBasicEvent"; || ident == "AnyBasicEvent";
let needs_event_stub = ident == "AnyStateEvent" || ident == "AnyMessageEvent"; let needs_event_stub =
ident == "AnyStateEvent" || ident == "AnyMessageEvent" || ident == "AnyEphemeralRoomEvent";
let needs_stripped_event = ident == "AnyStateEvent"; let needs_stripped_event = ident == "AnyStateEvent";

6
ruma-events/src/lib.rs
View File

@ -165,9 +165,9 @@ pub use self::{
algorithm::Algorithm, algorithm::Algorithm,
enums::{ enums::{
AnyBasicEvent, AnyBasicEventContent, AnyEphemeralRoomEvent, AnyEphemeralRoomEventContent, AnyBasicEvent, AnyBasicEventContent, AnyEphemeralRoomEvent, AnyEphemeralRoomEventContent,
AnyEvent, AnyMessageEvent, AnyMessageEventContent, AnyMessageEventStub, AnyRoomEvent, AnyEphemeralRoomEventStub, AnyEvent, AnyMessageEvent, AnyMessageEventContent,
AnyRoomEventStub, AnyStateEvent, AnyStateEventContent, AnyStateEventStub, AnyMessageEventStub, AnyRoomEvent, AnyRoomEventStub, AnyStateEvent, AnyStateEventContent,
AnyStrippedStateEventStub, AnyToDeviceEvent, AnyToDeviceEventContent, AnyStateEventStub, AnyStrippedStateEventStub, AnyToDeviceEvent, AnyToDeviceEventContent,
}, },
error::{FromStrError, InvalidInput}, error::{FromStrError, InvalidInput},
event_kinds::{ event_kinds::{