Compare commits
1 commit
main
...
nex/fix/be
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc79c84f65 |
1 changed files with 19 additions and 10 deletions
|
|
@ -36,7 +36,7 @@ pub use self::{
|
||||||
room_version::RoomVersion,
|
room_version::RoomVersion,
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
debug, debug_error, err,
|
debug, err, error as log_error,
|
||||||
matrix::{Event, StateKey},
|
matrix::{Event, StateKey},
|
||||||
state_res::room_version::StateResolutionVersion,
|
state_res::room_version::StateResolutionVersion,
|
||||||
trace,
|
trace,
|
||||||
|
|
@ -173,7 +173,8 @@ where
|
||||||
initial_state,
|
initial_state,
|
||||||
&event_fetch,
|
&event_fetch,
|
||||||
)
|
)
|
||||||
.await?;
|
.await
|
||||||
|
.inspect_err(|_| log_error!("failed to calculate control events"))?;
|
||||||
|
|
||||||
debug!(count = resolved_control.len(), "resolved power events");
|
debug!(count = resolved_control.len(), "resolved power events");
|
||||||
trace!(map = ?resolved_control, "resolved power events");
|
trace!(map = ?resolved_control, "resolved power events");
|
||||||
|
|
@ -213,7 +214,8 @@ where
|
||||||
resolved_control, // The control events are added to the final resolved state
|
resolved_control, // The control events are added to the final resolved state
|
||||||
&event_fetch,
|
&event_fetch,
|
||||||
)
|
)
|
||||||
.await?;
|
.await
|
||||||
|
.inspect_err(|_| log_error!("failed to resolve left over state"))?;
|
||||||
|
|
||||||
// Ensure unconflicting state is in the final state
|
// Ensure unconflicting state is in the final state
|
||||||
resolved_state.extend(unconflicted);
|
resolved_state.extend(unconflicted);
|
||||||
|
|
@ -400,13 +402,17 @@ where
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
let fetcher = async |event_id: OwnedEventId| {
|
let fetcher = async |event_id: OwnedEventId| {
|
||||||
let pl = *event_to_pl
|
let pl = *event_to_pl.get(&event_id).ok_or_else(|| {
|
||||||
.get(&event_id)
|
Error::NotFound(format!(
|
||||||
.ok_or_else(|| Error::NotFound(String::new()))?;
|
"event unexpectedly missing from power level map: {event_id}",
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
let ev = fetch_event(event_id)
|
let ev = fetch_event(event_id.clone()).await.ok_or_else(|| {
|
||||||
.await
|
Error::NotFound(format!(
|
||||||
.ok_or_else(|| Error::NotFound(String::new()))?;
|
"event found in power level map but not in room graph: {event_id}",
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
Ok((pl, ev.origin_server_ts()))
|
Ok((pl, ev.origin_server_ts()))
|
||||||
};
|
};
|
||||||
|
|
@ -758,7 +764,10 @@ where
|
||||||
warn!("event {} failed the authentication check", event.event_id());
|
warn!("event {} failed the authentication check", event.event_id());
|
||||||
},
|
},
|
||||||
| Err(e) => {
|
| Err(e) => {
|
||||||
debug_error!("event {} failed the authentication check: {e}", event.event_id());
|
log_error!(
|
||||||
|
"failed to run authentication check on event {}: {e}",
|
||||||
|
event.event_id()
|
||||||
|
);
|
||||||
return Err(e);
|
return Err(e);
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue