From 183558150d1c2a022b9be60b22295f78d2326b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Wed, 9 Aug 2023 22:21:21 +0200
Subject: [PATCH] fix: don't show removed rooms in space

---
 src/service/rooms/spaces/mod.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs
index 9b57d53b..53232f46 100644
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@@ -19,6 +19,7 @@ use ruma::{
             join_rules::{self, AllowRule, JoinRule, RoomJoinRulesEventContent},
             topic::RoomTopicEventContent,
         },
+        space::child::SpaceChildEventContent,
         StateEventType,
     },
     space::SpaceRoomJoinRule,
@@ -124,11 +125,24 @@ impl Service {
                     if event_type != StateEventType::SpaceChild {
                         continue;
                     }
+
+                    let pdu = services()
+                        .rooms
+                        .timeline
+                        .get_pdu(&id)?
+                        .ok_or_else(|| Error::bad_database("Event in space state not found"))?;
+
+                    if serde_json::from_str::<SpaceChildEventContent>(pdu.content.get())
+                        .ok()
+                        .and_then(|c| c.via)
+                        .map_or(true, |v| v.is_empty())
+                    {
+                        continue;
+                    }
+
                     if let Ok(room_id) = OwnedRoomId::try_from(state_key) {
                         children_ids.push(room_id);
-                        children_pdus.push(services().rooms.timeline.get_pdu(&id)?.ok_or_else(
-                            || Error::bad_database("Event in space state not found"),
-                        )?);
+                        children_pdus.push(pdu);
                     }
                 }