Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: Make graph output easier to comprehend

Browse Source
This commit is contained in:
timedout
2026-05-25 17:53:53 +01:00
parent 4d27a935d6
commit f01e119890
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/admin/debug/commands.rs
+26 -17
View File
@@ -6,24 +6,24 @@ use std::{
}; };
use conduwuit::{ use conduwuit::{
Err, Result, debug_error, err, info, debug_error, err, info, matrix::{
matrix::{
Event,
pdu::{PduEvent, PduId, RawPduId}, pdu::{PduEvent, PduId, RawPduId},
}, Event,
trace, utils, }, trace,
utils,
utils::{ utils::{
stream::{IterStream, ReadyExt}, stream::{IterStream, ReadyExt},
string::EMPTY, string::EMPTY,
}, }, warn,
warn, Err,
Result,
}; };
use futures::{FutureExt, StreamExt, TryStreamExt}; use futures::{FutureExt, StreamExt, TryStreamExt};
use lettre::message::Mailbox; use lettre::message::Mailbox;
use ruma::{ use ruma::{
CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, api::federation::event::get_room_state, events::AnyStateEvent, serde::Raw, CanonicalJsonObject, CanonicalJsonValue,
OwnedRoomOrAliasId, OwnedServerName, RoomId, RoomVersionId, UInt, EventId, OwnedEventId, OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName,
api::federation::event::get_room_state, events::AnyStateEvent, serde::Raw, RoomId, RoomVersionId, UInt,
}; };
use service::rooms::{ use service::rooms::{
short::{ShortEventId, ShortRoomId}, short::{ShortEventId, ShortRoomId},
@@ -89,17 +89,18 @@ fn render_node(
graph: &mut String, graph: &mut String,
node_id: &str, node_id: &str,
event_id: &EventId, event_id: &EventId,
name: &str,
status: NodeStatus, status: NodeStatus,
) -> Result { ) -> Result {
let evt_str = event_id.to_string(); let evt_str = event_id.to_string();
let status_label = match status { let status_label = match status {
| NodeStatus::Normal(false) => evt_str, | NodeStatus::Normal(false) => format!("{evt_str}: {name}"),
| NodeStatus::Normal(true) => format!("{evt_str} (missing locally)"), | NodeStatus::Normal(true) => format!("{evt_str}: {name} (missing locally)"),
| NodeStatus::SoftFailed(false) => format!("{evt_str} (soft-failed)"), | NodeStatus::SoftFailed(false) => format!("{evt_str}: {name} (soft-failed)"),
| NodeStatus::SoftFailed(true) => format!("{evt_str} (soft-failed & missing locally)"), | NodeStatus::SoftFailed(true) => format!("{evt_str}: {name} (soft-failed & missing locally)"),
| NodeStatus::Rejected(false) => format!("{evt_str} (rejected)"), | NodeStatus::Rejected(false) => format!("{evt_str}: {name} (rejected)"),
| NodeStatus::Rejected(true) => format!("{evt_str} (rejected & missing locally)"), | NodeStatus::Rejected(true) => format!("{evt_str}: {name} (rejected & missing locally)"),
}; };
writeln!(graph, "{node_id}[\"{}\"]", status_label.as_str())?; writeln!(graph, "{node_id}[\"{}\"]", status_label.as_str())?;
@@ -168,6 +169,13 @@ pub(super) async fn show_auth_chain(&self, event_id: OwnedEventId) -> Result {
}) })
.clone() .clone()
}; };
let node_name = |e: &PduEvent| {
if let Some(state_key) = e.state_key() {
format!("{},'{}'", e.event_type(), state_key)
} else {
format!("{}", e.event_type())
}
};
while let Some(event) = stack.pop() { while let Some(event) = stack.pop() {
let current_event_id = event.event_id().to_owned(); let current_event_id = event.event_id().to_owned();
@@ -178,7 +186,7 @@ pub(super) async fn show_auth_chain(&self, event_id: OwnedEventId) -> Result {
let current_node_id = node_id_for(&current_event_id, &mut node_ids, &mut next_node_id); let current_node_id = node_id_for(&current_event_id, &mut node_ids, &mut next_node_id);
let current_status = node_status(&current_event_id, false).await; let current_status = node_status(&current_event_id, false).await;
render_node(&mut graph, &current_node_id, &current_event_id, current_status)?; render_node(&mut graph, &current_node_id, &current_event_id, &node_name(&event), current_status)?;
let mut children = Vec::with_capacity(event.auth_events.len()); let mut children = Vec::with_capacity(event.auth_events.len());
for auth_event_id in event.auth_events().rev() { for auth_event_id in event.auth_events().rev() {
@@ -242,6 +250,7 @@ pub(super) async fn show_auth_chain(&self, event_id: OwnedEventId) -> Result {
&mut graph, &mut graph,
&child.node_id, &child.node_id,
&child.event_id, &child.event_id,
"",
node_status(&child.event_id, true).await, node_status(&child.event_id, true).await,
)?; )?;
} }