ffi: create EventOrTransactionId enum for functions that can receive both

Author: jmartinesp

bindings/matrix-sdk-ffi/src/event.rs

@@ -1,9 +1,14 @@
 use anyhow::{bail, Context};
-use ruma::events::{
-    room::{message::Relation, redaction::SyncRoomRedactionEvent},
-    AnySyncMessageLikeEvent, AnySyncStateEvent, AnySyncTimelineEvent, AnyTimelineEvent,
-    MessageLikeEventContent as RumaMessageLikeEventContent, RedactContent,
-    RedactedStateEventContent, StaticStateEventContent, SyncMessageLikeEvent, SyncStateEvent,
+use matrix_sdk::IdParseError;
+use matrix_sdk_ui::timeline::TimelineEventItemId;
+use ruma::{
+    events::{
+        room::{message::Relation, redaction::SyncRoomRedactionEvent},
+        AnySyncMessageLikeEvent, AnySyncStateEvent, AnySyncTimelineEvent, AnyTimelineEvent,
+        MessageLikeEventContent as RumaMessageLikeEventContent, RedactContent,
+        RedactedStateEventContent, StaticStateEventContent, SyncMessageLikeEvent, SyncStateEvent,
+    },
+    EventId,
 };
 
 use crate::{
@@ -350,3 +355,38 @@ impl From<MessageLikeEventType> for ruma::events::MessageLikeEventType {
         }
     }
 }
+
+/// Contains the 2 possible identifiers of an event, either it has a remote
+/// event id or a local transaction id, never both or none.
+#[derive(Clone, uniffi::Enum)]
+pub enum EventOrTransactionId {
+    EventId { event_id: String },
+    TransactionId { transaction_id: String },
+}
+
+impl From<TimelineEventItemId> for EventOrTransactionId {
+    fn from(value: TimelineEventItemId) -> Self {
+        match value {
+            TimelineEventItemId::EventId(event_id) => {
+                EventOrTransactionId::EventId { event_id: event_id.to_string() }
+            }
+            TimelineEventItemId::TransactionId(transaction_id) => {
+                EventOrTransactionId::TransactionId { transaction_id: transaction_id.to_string() }
+            }
+        }
+    }
+}
+
+impl TryFrom<EventOrTransactionId> for TimelineEventItemId {
+    type Error = IdParseError;
+    fn try_from(value: EventOrTransactionId) -> Result<Self, Self::Error> {
+        match value {
+            EventOrTransactionId::EventId { event_id } => {
+                Ok(TimelineEventItemId::EventId(EventId::parse(event_id)?))
+            }
+            EventOrTransactionId::TransactionId { transaction_id } => {
+                Ok(TimelineEventItemId::TransactionId(transaction_id.into()))
+            }
+        }
+    }
+}

bindings/matrix-sdk-ffi/src/timeline/mod.rs

@@ -67,6 +67,7 @@ use crate::client_builder::ClientBuilder;
 use crate::{
     client::ProgressWatcher,
     error::{ClientError, RoomError},
+    event::EventOrTransactionId,
     helpers::unwrap_or_clone_arc,
     ruma::{
         AssetType, AudioInfo, FileInfo, FormattedBody, ImageInfo, PollKind, ThumbnailInfo,
@@ -490,11 +491,11 @@ impl Timeline {
     /// local events that are being processed.
     pub async fn edit(
         &self,
-        event_or_transaction_id: String,
+        event_or_transaction_id: EventOrTransactionId,
         new_content: EditedContent,
     ) -> Result<bool, ClientError> {
         self.inner
-            .edit_by_id(&(event_or_transaction_id.into()), new_content.try_into()?)
+            .edit_by_id(&(event_or_transaction_id.try_into()?), new_content.try_into()?)
             .await
             .map_err(Into::into)
     }
@@ -603,11 +604,11 @@ impl Timeline {
     /// Will return an error if the event couldn't be redacted.
     pub async fn redact_event(
         &self,
-        event_or_transaction_id: String,
+        event_or_transaction_id: EventOrTransactionId,
         reason: Option<String>,
     ) -> Result<(), ClientError> {
         self.inner
-            .redact_by_id(&(event_or_transaction_id.into()), reason.as_deref())
+            .redact_by_id(&(event_or_transaction_id.try_into()?), reason.as_deref())
             .await
             .map_err(Into::into)
     }
@@ -1033,8 +1034,7 @@ impl From<SdkShieldState> for ShieldState {
 pub struct EventTimelineItem {
     is_local: bool,
     is_remote: bool,
-    transaction_id: Option<String>,
-    event_id: Option<String>,
+    event_or_transaction_id: EventOrTransactionId,
     sender: String,
     sender_profile: ProfileDetails,
     is_own: bool,
@@ -1072,8 +1072,7 @@ impl From<matrix_sdk_ui::timeline::EventTimelineItem> for EventTimelineItem {
         Self {
             is_local: value.is_local_echo(),
             is_remote: !value.is_local_echo(),
-            transaction_id: value.transaction_id().map(|t| t.to_string()),
-            event_id: value.event_id().map(|e| e.to_string()),
+            event_or_transaction_id: value.identifier().into(),
             sender: value.sender().to_string(),
             sender_profile: value.sender_profile().into(),
             is_own: value.is_own(),