From 7c82de99c91fdbd8ca422bb04a0a7ef78833e39a Mon Sep 17 00:00:00 2001
From: Devon Hudson <devonhudson@librem.one>
Date: Fri, 2 Jun 2023 19:05:16 -0600
Subject: [PATCH] Refine SenderID/UserID usage

---
 syncapi/synctypes/clientevent.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/syncapi/synctypes/clientevent.go b/syncapi/synctypes/clientevent.go
index bbd4a75c7..ba8ac7796 100644
--- a/syncapi/synctypes/clientevent.go
+++ b/syncapi/synctypes/clientevent.go
@@ -57,9 +57,14 @@ func ToClientEvents(serverEvs []gomatrixserverlib.PDU, format ClientEventFormat)
 
 // ToClientEvent converts a single server event to a client event.
 func ToClientEvent(se gomatrixserverlib.PDU, format ClientEventFormat) ClientEvent {
+	user := ""
+	userID, err := se.UserID()
+	if err == nil {
+		user = userID.String()
+	}
 	ce := ClientEvent{
 		Content:        spec.RawJSON(se.Content()),
-		Sender:         se.SenderID(),
+		Sender:         user,
 		Type:           se.Type(),
 		StateKey:       se.StateKey(),
 		Unsigned:       spec.RawJSON(se.Unsigned()),