From 1ba96b95340559d405155f47cf41c0a8928d0935 Mon Sep 17 00:00:00 2001
From: Lambda <csgl@xiretza.xyz>
Date: Fri, 30 Aug 2024 22:18:50 +0000
Subject: [PATCH] Mark events as not visible when they're not found or in the
 wrong room

---
 src/service/rooms/state_accessor.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/service/rooms/state_accessor.rs b/src/service/rooms/state_accessor.rs
index b9e9f702..5a15718e 100644
--- a/src/service/rooms/state_accessor.rs
+++ b/src/service/rooms/state_accessor.rs
@@ -215,6 +215,14 @@ impl Service {
     ) -> Result<bool> {
         let lookup = Lookup::VisibilityForUser;
 
+        let Some(pdu) = services().rooms.timeline.get_pdu(event_id)? else {
+            return Ok(false);
+        };
+
+        if pdu.room_id() != room_id {
+            return Ok(false);
+        }
+
         let Some(shortstatehash) = self.pdu_shortstatehash(event_id)? else {
             return Ok(true);
         };