mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-08-18 13:24:40 +02:00
Merge branch 'nyaaori/fix-join-panic' into 'next'
Fix join panic bug See merge request famedly/conduit!224
This commit is contained in:
commit
9b63708685
|
@ -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"),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -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"),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue