From 23d91b64cb68dc897797a1a48de530c5b95c8a00 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 9 May 2025 14:25:43 +0300
Subject: [PATCH] bridgev2: fall back to remote ID for state update notices

---
 bridgev2/bridgestate.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bridgev2/bridgestate.go b/bridgev2/bridgestate.go
index 148b522c..81ec8160 100644
--- a/bridgev2/bridgestate.go
+++ b/bridgev2/bridgestate.go
@@ -89,7 +89,11 @@ func (bsq *BridgeStateQueue) sendNotice(ctx context.Context, state status.Bridge
 		bsq.login.Log.Err(err).Msg("Failed to get management room")
 		return
 	}
-	message := fmt.Sprintf("State update for %s: `%s`", bsq.login.RemoteName, state.StateEvent)
+	name := bsq.login.RemoteName
+	if name == "" {
+		name = fmt.Sprintf("`%s`", bsq.login.ID)
+	}
+	message := fmt.Sprintf("State update for %s: `%s`", name, state.StateEvent)
 	if state.Error != "" {
 		message += fmt.Sprintf(" (`%s`)", state.Error)
 	}