From ead9a58dce891b82f93c9673c79c26abaa8db422 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Wed, 24 Jan 2024 12:17:54 -0500
Subject: [PATCH] dont crash failing to deserialise room creation content

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/api/client_server/room.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs
index cef9c9b4..144ed131 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@@ -149,7 +149,10 @@ pub async fn create_room_route(
         Some(content) => {
             let mut content = content
                 .deserialize_as::<CanonicalJsonObject>()
-                .expect("Invalid creation content");
+                .map_err(|e| {
+                    error!("Failed to deserialise content as canonical JSON: {}", e);
+                    Error::bad_database("Failed to deserialise content as canonical JSON.")
+                })?;
             match room_version {
                 RoomVersionId::V1
                 | RoomVersionId::V2