From 58d135bc578fcbb12dcb8cb3c119bc939f84ff0b Mon Sep 17 00:00:00 2001
From: timedout <git@nexy7574.co.uk>
Date: Tue, 29 Sep 2026 22:06:48 +0100
Subject: [PATCH] fix: Return the actual state at in `!admin debug
 get-state-at`

Previously this command actually returned the state *before*, which made debugging with it confusing.
---
 src/admin/debug/commands.rs | 43 +++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/admin/debug/commands.rs b/src/admin/debug/commands.rs
index 438afdef0..9fc69aae9 100644
--- a/src/admin/debug/commands.rs
+++ b/src/admin/debug/commands.rs
@@ -8,13 +8,15 @@
 use conduwuit::{
 	Err, Result, at, debug_error, err, info,
 	matrix::{
-		Event,
+		Event, StateKey,
 		pdu::{PduEvent, PduId, RawPduId},
 	},
+	state_res::EventTypeExt,
 	trace, utils,
 	utils::{
 		stream::{IterStream, ReadyExt},
 		string::EMPTY,
+		to_canonical_object,
 	},
 	warn,
 };
@@ -27,7 +29,9 @@
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
 	OwnedRoomOrAliasId, OwnedServerName, RoomId, RoomVersionId, UInt,
-	api::federation::event::get_room_state, events::AnyStateEvent, serde::Raw,
+	api::federation::event::get_room_state,
+	events::{AnyStateEvent, StateEventType},
+	serde::Raw,
 };
 use service::rooms::{
 	short::{ShortEventId, ShortRoomId},
@@ -533,19 +537,36 @@ pub(super) async fn get_state_at(&self, event_id: OwnedEventId) -> Result {
 			.collect()
 			.await;
 
-		let pdus: Vec<CanonicalJsonObject> = state_ids
+		let mut pdus: HashMap<(StateEventType, StateKey), CanonicalJsonObject> = state_ids
 			.iter()
-			.try_stream()
-			.and_then(|id| self.services.rooms.timeline.get_pdu_json(id))
+			.try_stream::<conduwuit::Error>()
+			.and_then(|id| async {
+				let pdu_json = self.services.rooms.timeline.get_pdu_json(id).await?;
+				let event_type = pdu_json
+					.get("type")
+					.and_then(CanonicalJsonValue::as_str)
+					.expect("event type must be present in events");
+				let state_key = pdu_json
+					.get("state_key")
+					.and_then(CanonicalJsonValue::as_str)
+					.expect("state keys must be present for events in the room state");
+				Ok(((event_type.into(), state_key.into()), pdu_json))
+			})
 			.try_collect()
 			.await?;
 
-		let json = serde_json::to_string_pretty(&pdus).map_err(|e| {
-			err!(Database(
-				"Failed to convert room state events to pretty JSON, possible invalid room \
-				 state events in our database {e}",
-			))
-		})?;
+		let pdu = self.services.rooms.timeline.get_pdu(&event_id).await?;
+		if let Some(state_key) = pdu.state_key() {
+			pdus.insert(pdu.kind().with_state_key(state_key), to_canonical_object(pdu)?);
+		}
+
+		let json =
+			serde_json::to_string_pretty(&pdus.values().collect::<Vec<_>>()).map_err(|e| {
+				err!(Database(
+					"Failed to convert room state events to pretty JSON, possible invalid room \
+					 state events in our database {e}",
+				))
+			})?;
 
 		let out = format!("```json\n{json}\n```");
 		self.write_str(&out).await