Refactor messages propagation

matrixgw_backend/src/broadcast_messages.rs

@@ -8,6 +8,13 @@ use matrix_sdk::sync::SyncResponse;
 
 pub type BroadcastSender = tokio::sync::broadcast::Sender<BroadcastMessage>;
 
+#[derive(Debug, Clone)]
+pub struct BxRoomEvent<E> {
+    pub user: UserEmail,
+    pub event: Box<E>,
+    pub room: Room,
+}
+
 /// Broadcast messages
 #[derive(Debug, Clone)]
 pub enum BroadcastMessage {
@@ -20,23 +27,11 @@ pub enum BroadcastMessage {
     /// Matrix sync thread has been interrupted
     SyncThreadStopped(MatrixSyncTaskID),
     /// New room message
-    RoomMessageEvent {
-        user: UserEmail,
-        event: Box<OriginalSyncRoomMessageEvent>,
-        room: Room,
-    },
+    RoomMessageEvent(BxRoomEvent<OriginalSyncRoomMessageEvent>),
     /// New reaction message
-    ReactionEvent {
-        user: UserEmail,
-        event: Box<OriginalSyncReactionEvent>,
-        room: Room,
-    },
+    ReactionEvent(BxRoomEvent<OriginalSyncReactionEvent>),
     /// New room redaction
-    RoomRedactionEvent {
-        user: UserEmail,
-        event: Box<OriginalSyncRoomRedactionEvent>,
-        room: Room,
-    },
+    RoomRedactionEvent(BxRoomEvent<OriginalSyncRoomRedactionEvent>),
     /// Raw Matrix sync response
     MatrixSyncResponse { user: UserEmail, sync: SyncResponse },
 }