From 86177faae7f812136d02d08fe2f6533eabe28642 Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Sun, 7 Nov 2021 07:57:15 +0000
Subject: [PATCH] Fix join panic bug

---
 src/client_server/membership.rs | 2 +-
 src/server_server.rs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client_server/membership.rs b/src/client_server/membership.rs
index 732f6162..ec685ec9 100644
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@@ -934,7 +934,7 @@ pub(crate) async fn invite_helper<'a>(
                 unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
                 unsigned.insert(
                     "prev_sender".to_owned(),
-                    serde_json::from_str(prev_pdu.sender.as_str()).expect("UserId is valid string"),
+                    to_raw_value(&prev_pdu.sender).expect("UserId is valid"),
                 );
             }
 
diff --git a/src/server_server.rs b/src/server_server.rs
index 68e262b4..482edf0f 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -2721,7 +2721,7 @@ pub fn create_join_event_template_route(
         unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
         unsigned.insert(
             "prev_sender".to_owned(),
-            serde_json::from_str(prev_pdu.sender.as_str()).expect("UserId is valid string"),
+            to_raw_value(&prev_pdu.sender).expect("UserId is valid"),
         );
     }