sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Merge changes from main

Browse source
This commit is contained in:
Devon Hudson 2023-07-06 17:58:17 -06:00
parent f825ce2935 cc9b695c1e
commit 4e27ff28b8
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncapi/consumers/roomserver.go
View file

@ -602,10 +602,16 @@ func (s *OutputRoomEventConsumer) updateStateEvent(event *rstypes.HeaderedEvent)
} }
} }
prevEventSender := string(prevEvent.SenderID())
prevUser, err := s.rsAPI.QueryUserIDForSender(s.ctx, *validRoomID, prevEvent.SenderID())
if err == nil && prevUser != nil {
prevEventSender = prevUser.String()
}
prev := types.PrevEventRef{ prev := types.PrevEventRef{
PrevContent: prevContent, PrevContent: prevContent,
ReplacesState: prevEvent.EventID(), ReplacesState: prevEvent.EventID(),
PrevSenderID: string(prevEvent.SenderID()), PrevSenderID: prevEventSender,
} }
event.PDU, err = event.SetUnsigned(prev) event.PDU, err = event.SetUnsigned(prev)