From 8ad52e34ea57cf1cd4a6c12ac418ab96ff1b1dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Mon, 30 Jun 2025 16:16:20 +0200
Subject: [PATCH] refactor: Don't use AnyMessageLikeEventContent with the event
 factory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When we upgrade Ruma, the `EventContent` bound on `EventBuilder` will be
changed to `StaticEventContent`, which is not implemented by the
`Any*EventContent` enums.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
---
 .../matrix-sdk-ui/src/timeline/tests/polls.rs | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/crates/matrix-sdk-ui/src/timeline/tests/polls.rs b/crates/matrix-sdk-ui/src/timeline/tests/polls.rs
index 850b4d2e8..6b53463ca 100644
--- a/crates/matrix-sdk-ui/src/timeline/tests/polls.rs
+++ b/crates/matrix-sdk-ui/src/timeline/tests/polls.rs
@@ -3,16 +3,9 @@ use fakes::poll_a2;
 use matrix_sdk_test::{async_test, ALICE, BOB};
 use ruma::{
     event_id,
-    events::{
-        poll::{
-            unstable_end::UnstablePollEndEventContent,
-            unstable_response::UnstablePollResponseEventContent,
-            unstable_start::{
-                NewUnstablePollStartEventContent, ReplacementUnstablePollStartEventContent,
-                UnstablePollStartContentBlock,
-            },
-        },
-        AnyMessageLikeEventContent,
+    events::poll::unstable_start::{
+        NewUnstablePollStartEventContent, ReplacementUnstablePollStartEventContent,
+        UnstablePollStartContentBlock, UnstablePollStartEventContent,
     },
     server_name, EventId, OwnedEventId, UserId,
 };
@@ -268,27 +261,17 @@ impl TestTimeline {
     }
 
     async fn send_poll_start(&self, sender: &UserId, content: UnstablePollStartContentBlock) {
-        let event_content = AnyMessageLikeEventContent::UnstablePollStart(
-            NewUnstablePollStartEventContent::new(content).into(),
-        );
+        let event_content =
+            UnstablePollStartEventContent::from(NewUnstablePollStartEventContent::new(content));
         self.handle_live_event(self.factory.event(event_content).sender(sender)).await;
     }
 
     async fn send_poll_response(&self, sender: &UserId, answers: Vec<&str>, poll_id: &EventId) {
-        let event_content = AnyMessageLikeEventContent::UnstablePollResponse(
-            UnstablePollResponseEventContent::new(
-                answers.into_iter().map(|i| i.to_owned()).collect(),
-                poll_id.to_owned(),
-            ),
-        );
-        self.handle_live_event(self.factory.event(event_content).sender(sender)).await
+        self.handle_live_event(self.factory.poll_response(answers, poll_id).sender(sender)).await
     }
 
     async fn send_poll_end(&self, sender: &UserId, text: &str, poll_id: &EventId) {
-        let event_content = AnyMessageLikeEventContent::UnstablePollEnd(
-            UnstablePollEndEventContent::new(text, poll_id.to_owned()),
-        );
-        self.handle_live_event(self.factory.event(event_content).sender(sender)).await
+        self.handle_live_event(self.factory.poll_end(text, poll_id).sender(sender)).await
     }
 
     async fn send_poll_edit(
@@ -297,9 +280,9 @@ impl TestTimeline {
         original_id: &EventId,
         content: UnstablePollStartContentBlock,
     ) {
-        let content =
-            ReplacementUnstablePollStartEventContent::new(content, original_id.to_owned());
-        let event_content = AnyMessageLikeEventContent::UnstablePollStart(content.into());
+        let event_content = UnstablePollStartEventContent::from(
+            ReplacementUnstablePollStartEventContent::new(content, original_id.to_owned()),
+        );
         self.handle_live_event(self.factory.event(event_content).sender(sender)).await
     }
 }