Drop conversion of DecryptedRoomEvent into TimelineEvent

matrix-org/matrix-rust-sdk@5a1909a
removes the implicit converstion from `DecryptedRoomEvent` to `TimelineEvent`
that we'd been relying on since d7eca6f (which in turn was due to
matrix-org/matrix-rust-sdk@1d1863d).

It turns out we don't really need to go via TimelineEvent.

Author: richvdh

src/machine.rs

@@ -10,12 +10,9 @@ use std::{
 
 use futures_util::{pin_mut, Stream, StreamExt};
 use js_sys::{Array, Function, JsString, Map, Promise, Set};
-use matrix_sdk_common::{
-    deserialized_responses::TimelineEvent,
-    ruma::{
-        self, events::secret::request::SecretName, serde::Raw, OneTimeKeyAlgorithm, OwnedDeviceId,
-        OwnedTransactionId, OwnedUserId, UInt,
-    },
+use matrix_sdk_common::ruma::{
+    self, events::secret::request::SecretName, serde::Raw, OneTimeKeyAlgorithm, OwnedDeviceId,
+    OwnedTransactionId, OwnedUserId, UInt,
 };
 use matrix_sdk_crypto::{
     backups::MegolmV1BackupKey,
@@ -505,13 +502,12 @@ impl OlmMachine {
             responses::DecryptedRoomEvent,
             MegolmDecryptionError,
         >(async move {
-            let room_event: TimelineEvent = me
+            let decrypted = me
                 .decrypt_room_event(&event, room_id.as_ref(), &decryption_settings)
                 .await
-                .map_err(MegolmDecryptionError::from)?
-                .into();
+                .map_err(MegolmDecryptionError::from)?;
 
-            responses::DecryptedRoomEvent::try_from(room_event).map_err(
+            responses::DecryptedRoomEvent::try_from(decrypted).map_err(
                 |e: UnsupportedAlgorithmError| {
                     // This happens if we somehow encounter a room event whose encryption info we
                     // don't understand (e.g., it is encrypted with Olm rather than

src/responses.rs

@@ -215,18 +215,14 @@ impl DecryptedRoomEvent {
     }
 }
 
-impl TryFrom<matrix_sdk_common::deserialized_responses::TimelineEvent> for DecryptedRoomEvent {
+impl TryFrom<matrix_sdk_common::deserialized_responses::DecryptedRoomEvent> for DecryptedRoomEvent {
     type Error = UnsupportedAlgorithmError;
 
     fn try_from(
-        value: matrix_sdk_common::deserialized_responses::TimelineEvent,
+        value: matrix_sdk_common::deserialized_responses::DecryptedRoomEvent,
     ) -> Result<Self, Self::Error> {
-        let encryption_info = match value.encryption_info() {
-            None => None,
-            Some(encryption_info) => Some(encryption_info.clone().try_into()?),
-        };
-
-        Ok(Self { event: value.raw().json().get().to_owned().into(), encryption_info })
+        let encryption_info = Some(value.encryption_info.clone().try_into()?);
+        Ok(Self { event: value.event.json().get().into(), encryption_info })
     }
 }