mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-13 12:16:54 +00:00
fix: Remove redundant check that accidentally banned everyone
This commit is contained in:
2 files changed
+2
-21
No files matched your search
@@ -224,7 +224,7 @@ pub async fn handle_incoming_pdu<'a>(
|
||||
let (incoming_pdu, val) = self
|
||||
.handle_outlier_pdu(origin, create_event, event_id, room_id, value, false)
|
||||
.await
|
||||
.inspect(|e| error!("[TODO] Failed to handle outlier PDU: {e:?}"))?;
|
||||
.inspect_err(|e| error!("[TODO] Failed to handle outlier PDU: {e:?}"))?;
|
||||
|
||||
// 8. if not timeline event: stop
|
||||
if !is_timeline_event {
|
||||
|
||||
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashMap, hash_map};
|
||||
|
||||
use conduwuit::{
|
||||
Err, Event, PduEvent, Result, debug, debug_info, debug_warn, err, implement, info, state_res,
|
||||
state_res::EventTypeExt, trace, warn,
|
||||
trace, warn,
|
||||
};
|
||||
use futures::future::ready;
|
||||
use ruma::{
|
||||
@@ -204,25 +204,6 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
// The original create event must be in the auth events
|
||||
let claimed_create_event =
|
||||
auth_events_by_key.get(&StateEventType::RoomCreate.with_state_key(""));
|
||||
if let Some(claimed_create_event) = claimed_create_event {
|
||||
if claimed_create_event.event_id() != create_event.event_id() {
|
||||
self.services.pdu_metadata.mark_event_rejected(event_id);
|
||||
self.services
|
||||
.outlier
|
||||
.add_pdu_outlier(pdu_event.event_id(), &incoming_pdu);
|
||||
return Err!(Request(Forbidden(
|
||||
"Incoming event refers to wrong create event (expected {}, got {})",
|
||||
create_event.event_id(),
|
||||
claimed_create_event.event_id(),
|
||||
)));
|
||||
}
|
||||
} else if !pdu_event.auth_events.is_empty() {
|
||||
return Err!(Request(Forbidden("Incoming event does not refer to any create event")));
|
||||
}
|
||||
|
||||
let state_fetch = |ty: &StateEventType, sk: &str| {
|
||||
let key = (ty.to_owned(), sk.into());
|
||||
ready(auth_events_by_key.get(&key).map(ToOwned::to_owned))
|
||||
|
||||
Reference in new issue
Block a user