diff --git a/crates/ruma-common/src/events/kinds.rs b/crates/ruma-common/src/events/kinds.rs index 007a7213..d2a251f1 100644 --- a/crates/ruma-common/src/events/kinds.rs +++ b/crates/ruma-common/src/events/kinds.rs @@ -5,9 +5,9 @@ use serde::{Deserialize, Serialize}; use super::{ EphemeralRoomEventContent, GlobalAccountDataEventContent, MessageLikeEventContent, - MessageLikeEventType, MessageLikeUnsigned, RedactedMessageLikeEventContent, - RedactedStateEventContent, RedactedUnsigned, RoomAccountDataEventContent, StateEventContent, - StateEventType, StateUnsigned, ToDeviceEventContent, + MessageLikeUnsigned, RedactedMessageLikeEventContent, RedactedStateEventContent, + RedactedUnsigned, RoomAccountDataEventContent, StateEventContent, StateUnsigned, + ToDeviceEventContent, }; use crate::{EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; diff --git a/crates/ruma-macros/src/events/event.rs b/crates/ruma-macros/src/events/event.rs index 8d51029c..4842e32a 100644 --- a/crates/ruma-macros/src/events/event.rs +++ b/crates/ruma-macros/src/events/event.rs @@ -384,7 +384,9 @@ fn expand_redact_event( where_clause.predicates.push(parse_quote! { #ty_param: #ruma_common::events::RedactContent }); where_clause.predicates.push(parse_quote! { <#ty_param as #ruma_common::events::RedactContent>::Redacted: - #ruma_common::events::EventContent + #ruma_common::events::EventContent< + EventType = #ruma_common::events::#redacted_event_type_enum + > + #ruma_common::events::RedactedEventContent });