serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 13:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nyaaori/fix-join-panic' into 'next'

Browse source 
Fix join panic bug

See merge request famedly/conduit!224
This commit is contained in:
Jonas Platte 2021-11-09 14:46:28 +00:00
commit 9b63708685
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client_server/membership.rs
View file

@ -934,7 +934,7 @@ pub(crate) async fn invite_helper<'a>(
unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone()); unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
unsigned.insert( unsigned.insert(
"prev_sender".to_owned(), "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"),
); );
} }

2
src/server_server.rs
View file

@ -2721,7 +2721,7 @@ pub fn create_join_event_template_route(
unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone()); unsigned.insert("prev_content".to_owned(), prev_pdu.content.clone());
unsigned.insert( unsigned.insert(
"prev_sender".to_owned(), "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"),
); );
} }