From 4cb73531615e903176a5b8e370b4392137bfb8ac Mon Sep 17 00:00:00 2001 From: Devin Ragotzy Date: Thu, 14 Jan 2021 20:23:46 -0500 Subject: [PATCH] Remove outdated TODOs --- src/event_auth.rs | 1 - src/lib.rs | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/event_auth.rs b/src/event_auth.rs index bc87ec6f..5b8e5e76 100644 --- a/src/event_auth.rs +++ b/src/event_auth.rs @@ -43,7 +43,6 @@ pub fn auth_types_for_event( } } - // TODO what when we don't find a state_key let key = (EventType::RoomMember, state_key); if !auth_types.contains(&key) { auth_types.push(key) diff --git a/src/lib.rs b/src/lib.rs index 27a8b4c2..7bd58549 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -502,7 +502,6 @@ impl StateResolution { let mut auth_events = BTreeMap::new(); for aid in &event.auth_events() { if let Ok(ev) = StateResolution::get_or_load_event(room_id, &aid, event_map) { - // TODO what to do when no state_key is found ?? // TODO synapse check "rejected_reason", I'm guessing this is redacted_because in ruma ?? auth_events.insert((ev.kind(), ev.state_key()), ev); } else { @@ -747,14 +746,9 @@ pub fn is_power_event(event: &Arc) -> bool { event.state_key() == Some("".into()) } EventType::RoomMember => { - if let Ok(content) = - // TODO fix clone - serde_json::from_value::(event.content()) - { + if let Ok(content) = serde_json::from_value::(event.content()) { if [MembershipState::Leave, MembershipState::Ban].contains(&content.membership) { - return event.sender().as_str() - // TODO is None here a failure - != event.state_key().as_deref().unwrap_or("NOT A STATE KEY"); + return Some(event.sender().as_str()) != event.state_key().as_deref(); } }