char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'get-pdu-json' into 'master'

Browse source 
Consistent and escaped response in get_pdu

See merge request famedly/conduit!160
This commit is contained in:
Timo Kösters 2021-08-22 11:08:11 +00:00
commit b3ea6adc9c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/database/rooms.rs
View file

@ -7,6 +7,7 @@ use crate::{pdu::PduBuilder, utils, Database, Error, PduEvent, Result};
use lru_cache::LruCache; use lru_cache::LruCache;
use regex::Regex; use regex::Regex;
use ring::digest; use ring::digest;
use rocket::http::RawStr;
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation}, api::{client::error::ErrorKind, federation},
events::{ events::{
@ -1458,16 +1459,19 @@ impl Rooms {
} }
match pdu_json { match pdu_json {
Some(json) => { Some(json) => {
let json_text =
serde_json::to_string_pretty(&json)
.expect("canonical json is valid json");
db.admin.send(AdminCommand::SendMessage( db.admin.send(AdminCommand::SendMessage(
message::MessageEventContent::text_html( message::MessageEventContent::text_html(
format!("{}\n```json\n{:#?}\n```", format!("{}\n```json\n{}\n```",
if outlier { if outlier {
"PDU is outlier" "PDU is outlier"
} else { "PDU was accepted"}, json), } else { "PDU was accepted"}, json_text),
format!("<p>{}</p>\n<pre><code class=\"language-json\">{}\n</code></pre>\n", format!("<p>{}</p>\n<pre><code class=\"language-json\">{}\n</code></pre>\n",
if outlier { if outlier {
"PDU is outlier" "PDU is outlier"
} else { "PDU was accepted"}, serde_json::to_string_pretty(&json).expect("canonical json is valid json")) } else { "PDU was accepted"}, RawStr::new(&json_text).html_escape())
), ),
)); ));
} }