magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove outdated TODOs, use StateEvent::from_id_value consistently

Browse source
This commit is contained in:
Devin Ragotzy 2020-11-14 16:18:15 -05:00 • committed by Timo Kösters
parent 234b226468
commit 86bb93f8cf
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
3 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client_server/membership.rs
View file

@ -545,7 +545,7 @@ async fn join_room_by_id_helper(
);
// It has enough fields to be called a proper event now
let join_event = dbg!(canon_json_stub);
let join_event = canon_json_stub;
let send_join_response = server_server::send_request(
&db.globals,
@ -577,7 +577,7 @@ async fn join_room_by_id_helper(
.expect("a valid EventId can be converted to CanonicalJsonValue"),
);
Ok((event_id, serde_json::json!(value))) // TODO CanonicalJsonValue fixup?
Ok((event_id, serde_json::json!(value)))
};
let room_state = send_join_response.room_state.state.iter().map(add_event_id);
@ -602,7 +602,8 @@ async fn join_room_by_id_helper(
)))) // Add join event we just created
.map(|r| {
let (event_id, value) = r?;
serde_json::from_value::<StateEvent>(value.clone())
// TODO remove .clone when I remove debug logging
state_res::StateEvent::from_id_value(event_id.clone(), value.clone())
.map(|ev| (event_id, Arc::new(ev)))
.map_err(|e| {
warn!("{}: {}", value, e);
@ -642,7 +643,9 @@ async fn join_room_by_id_helper(
.expect("iterative auth check failed on resolved events");
// This removes the control events that failed auth, leaving the resolved
// to be mainline sorted
// to be mainline sorted. In the actual `state_res::StateResolution::resolve`
// function both are removed since these are all events we don't know of
// we must keep track of everything to add to our DB.
let events_to_sort = event_map
.keys()
.filter(|id| {