From 79b49134f4b318011b42d534ac5fca66a149b00c Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Tue, 10 Nov 2026 21:01:48 +0000 Subject: [PATCH] fix: Correct conflict in patch --- src/service/rooms/threads/mod.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/service/rooms/threads/mod.rs b/src/service/rooms/threads/mod.rs index fa0956abe..4274933aa 100644 --- a/src/service/rooms/threads/mod.rs +++ b/src/service/rooms/threads/mod.rs @@ -105,7 +105,7 @@ impl Service { return Ok(()); }; - let thread: Vec<_> = self + let thread = self .services .pdu_metadata .get_relations( @@ -116,11 +116,9 @@ impl Service { usize::MAX, 0, Direction::Backward, + |pdu| RelationType::Thread.relation_type_equal(pdu), ) - .await - .into_iter() - .filter(|(_, pdu)| RelationType::Thread.relation_type_equal(pdu)) - .collect(); + .await; match thread.first() { | Some((_, latest)) => Self::set_thread(