From 7eb57a9fd5f624a0908232bd002fe329c992af98 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Tue, 16 Jan 2024 21:25:08 -0500
Subject: [PATCH] explicitly fallback to None for invalid/empty room topics
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
src/api/client_server/directory.rs | 2 +-
src/service/rooms/spaces/mod.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/api/client_server/directory.rs b/src/api/client_server/directory.rs
index 52ac1b207..2d5172b2b 100644
--- a/src/api/client_server/directory.rs
+++ b/src/api/client_server/directory.rs
@@ -247,7 +247,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
Error::bad_database("Invalid room topic event in database.")
})
})
- .unwrap_or_default(),
+ .unwrap_or(None),
world_readable: services()
.rooms
.state_accessor
diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs
index 4c763e863..677ba2472 100644
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@@ -347,7 +347,7 @@ async fn get_room_chunk(
Error::bad_database("Invalid room topic event in database.")
})
})
- .unwrap_or_default(),
+ .unwrap_or(None),
world_readable: services()
.rooms
.state_accessor
--
GitLab