nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Have Media db return optional content_type, conversion fixes

Browse source
This commit is contained in:
Devin Ragotzy 2020-11-18 08:36:12 -05:00 • committed by Timo Kösters
parent bb24f6ad90
commit b6d721374f
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
5 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client_server/membership.rs
View file

@ -510,8 +510,7 @@ async fn join_room_by_id_helper(
.expect("event is valid, we just created it"),
);
// TODO fixup CanonicalJsonValue
// use that instead of serde_json::Map... maybe?
// Convert `serde_json;:Value` to `CanonicalJsonObj` for hashing/signing
let mut canon_json_stub: BTreeMap<_, ruma::signatures::CanonicalJsonValue> =
serde_json::from_value(join_event_stub_value).expect("json Value is canonical JSON");