mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-15 01:53:09 -06:00
Refine SenderID/UserID usage
This commit is contained in:
parent
752c89fb02
commit
7c82de99c9
|
|
@ -57,9 +57,14 @@ func ToClientEvents(serverEvs []gomatrixserverlib.PDU, format ClientEventFormat)
|
||||||
|
|
||||||
// ToClientEvent converts a single server event to a client event.
|
// ToClientEvent converts a single server event to a client event.
|
||||||
func ToClientEvent(se gomatrixserverlib.PDU, format ClientEventFormat) ClientEvent {
|
func ToClientEvent(se gomatrixserverlib.PDU, format ClientEventFormat) ClientEvent {
|
||||||
|
user := ""
|
||||||
|
userID, err := se.UserID()
|
||||||
|
if err == nil {
|
||||||
|
user = userID.String()
|
||||||
|
}
|
||||||
ce := ClientEvent{
|
ce := ClientEvent{
|
||||||
Content: spec.RawJSON(se.Content()),
|
Content: spec.RawJSON(se.Content()),
|
||||||
Sender: se.SenderID(),
|
Sender: user,
|
||||||
Type: se.Type(),
|
Type: se.Type(),
|
||||||
StateKey: se.StateKey(),
|
StateKey: se.StateKey(),
|
||||||
Unsigned: spec.RawJSON(se.Unsigned()),
|
Unsigned: spec.RawJSON(se.Unsigned()),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue