Merge branch 'parse-pdu-command-panic' into 'next'

fix: do not panic on a JSON not containing the PDU

Closes #236

See merge request famedly/conduit!304

src/database/admin.rs

@@ -354,24 +354,26 @@ fn process_admin_command(
                 let string = body[1..body.len() - 1].join("\n");
                 match serde_json::from_str(&string) {
                     Ok(value) => {
-                        let event_id = EventId::parse(format!(
+                        match ruma::signatures::reference_hash(&value, &RoomVersionId::V6) {
-                            "${}",
+                            Ok(hash) => {
-                            // Anything higher than version3 behaves the same
+                                let event_id = EventId::parse(format!("${}", hash));
-                            ruma::signatures::reference_hash(&value, &RoomVersionId::V6)
+
-                                .expect("ruma can calculate reference hashes")
+                                match serde_json::from_value::<PduEvent>(
-                        ))
+                                    serde_json::to_value(value).expect("value is json"),
-                        .expect("ruma's reference hashes are valid event ids");
+                                ) {
-
+                                    Ok(pdu) => RoomMessageEventContent::text_plain(format!(
-                        match serde_json::from_value::<PduEvent>(
+                                        "EventId: {:?}\n{:#?}",
-                            serde_json::to_value(value).expect("value is json"),
+                                        event_id, pdu
-                        ) {
+                                    )),
-                            Ok(pdu) => RoomMessageEventContent::text_plain(format!(
+                                    Err(e) => RoomMessageEventContent::text_plain(format!(
-                                "EventId: {:?}\n{:#?}",
+                                        "EventId: {:?}\nCould not parse event: {}",
-                                event_id, pdu
+                                        event_id, e
-                            )),
+                                    )),
+                                }
+                            }
                             Err(e) => RoomMessageEventContent::text_plain(format!(
-                                "EventId: {:?}\nCould not parse event: {}",
+                                "Could not parse PDU JSON: {:?}",
-                                event_id, e
+                                e
                             )),
                         }
                     }