Merge branch 'refactor2' into 'next'

Remove unnecessary uses of event enums

See merge request famedly/conduit!300

src/client_server/read_marker.rs

@@ -4,7 +4,7 @@ use ruma::{
         error::ErrorKind,
         r0::{read_marker::set_read_marker, receipt::create_receipt},
     },
-    events::{AnyEphemeralRoomEvent, EventType},
+    events::EventType,
     receipt::ReceiptType,
     MilliSecondsSinceUnixEpoch,
 };
@@ -73,10 +73,10 @@ pub async fn set_read_marker_route(
         db.rooms.edus.readreceipt_update(
             sender_user,
             &body.room_id,
-            AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
+            ruma::events::receipt::ReceiptEvent {
                 content: ruma::events::receipt::ReceiptEventContent(receipt_content),
                 room_id: body.room_id.clone(),
-            }),
+            },
             &db.globals,
         )?;
     }
@@ -130,10 +130,10 @@ pub async fn create_receipt_route(
     db.rooms.edus.readreceipt_update(
         sender_user,
         &body.room_id,
-        AnyEphemeralRoomEvent::Receipt(ruma::events::receipt::ReceiptEvent {
+        ruma::events::receipt::ReceiptEvent {
             content: ruma::events::receipt::ReceiptEventContent(receipt_content),
             room_id: body.room_id.clone(),
-        }),
+        },
         &db.globals,
     )?;
 

src/client_server/sync.rs

@@ -7,7 +7,7 @@ use ruma::{
     },
     events::{
         room::member::{MembershipState, RoomMemberEventContent},
-        AnySyncEphemeralRoomEvent, EventType,
+        EventType,
     },
     serde::Raw,
     DeviceId, RoomId, UserId,
@@ -656,10 +656,8 @@ async fn sync_helper(
         if db.rooms.edus.last_typing_update(&room_id, &db.globals)? > since {
             edus.push(
                 serde_json::from_str(
-                    &serde_json::to_string(&AnySyncEphemeralRoomEvent::Typing(
+                    &serde_json::to_string(&db.rooms.edus.typings_all(&room_id)?)
-                        db.rooms.edus.typings_all(&room_id)?,
+                        .expect("event is valid, we just created it"),
-                    ))
-                    .expect("event is valid, we just created it"),
                 )
                 .expect("event is valid, we just created it"),
             );

src/database/rooms/edus.rs

@@ -2,7 +2,8 @@ use crate::{database::abstraction::Tree, utils, Error, Result};
 use ruma::{
     events::{
         presence::{PresenceEvent, PresenceEventContent},
-        AnyEphemeralRoomEvent, SyncEphemeralRoomEvent,
+        receipt::ReceiptEvent,
+        SyncEphemeralRoomEvent,
     },
     presence::PresenceState,
     serde::Raw,
@@ -31,7 +32,7 @@ impl RoomEdus {
         &self,
         user_id: &UserId,
         room_id: &RoomId,
-        event: AnyEphemeralRoomEvent,
+        event: ReceiptEvent,
         globals: &super::super::globals::Globals,
     ) -> Result<()> {
         let mut prefix = room_id.as_bytes().to_vec();

src/server_server.rs

@@ -46,7 +46,7 @@ use ruma::{
             member::{MembershipState, RoomMemberEventContent},
             server_acl::RoomServerAclEventContent,
         },
-        AnyEphemeralRoomEvent, EventType,
+        EventType,
     },
     int,
     receipt::ReceiptType,
@@ -795,10 +795,10 @@ pub async fn send_transaction_message_route(
                             let mut receipt_content = BTreeMap::new();
                             receipt_content.insert(event_id.to_owned(), receipts);
 
-                            let event = AnyEphemeralRoomEvent::Receipt(ReceiptEvent {
+                            let event = ReceiptEvent {
                                 content: ReceiptEventContent(receipt_content),
                                 room_id: room_id.clone(),
-                            });
+                            };
                             db.rooms.edus.readreceipt_update(
                                 &user_id,
                                 &room_id,