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

Fix prev event lookup in syncapi (#3141)

Browse source 
The syncapi operates using userID's so when querying for the previous
state event we need to lookup the userID from the given senderID before
the state query.
This commit is contained in:
devonh 2023-07-06 19:50:28 +00:00 committed by GitHub
parent d507c5fc95
commit 3a125fd8fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
syncapi/consumers/roomserver.go
View file

@ -558,29 +558,28 @@ func (s *OutputRoomEventConsumer) updateStateEvent(event *rstypes.HeaderedEvent)
var succeeded bool var succeeded bool
defer sqlutil.EndTransactionWithCheck(snapshot, &succeeded, &err) defer sqlutil.EndTransactionWithCheck(snapshot, &succeeded, &err)
prevEvent, err := snapshot.GetStateEvent(
s.ctx, event.RoomID(), event.Type(), stateKey,
)
if err != nil {
return event, err
}
validRoomID, err := spec.NewRoomID(event.RoomID()) validRoomID, err := spec.NewRoomID(event.RoomID())
if err != nil { if err != nil {
return event, err return event, err
} }
if event.StateKey() != nil { sKeyUser := ""
if *event.StateKey() != "" { if stateKey != "" {
var sku *spec.UserID var sku *spec.UserID
sku, err = s.rsAPI.QueryUserIDForSender(s.ctx, *validRoomID, spec.SenderID(stateKey)) sku, err = s.rsAPI.QueryUserIDForSender(s.ctx, *validRoomID, spec.SenderID(stateKey))
if err == nil && sku != nil { if err == nil && sku != nil {
sKey := sku.String() sKeyUser = sku.String()
event.StateKeyResolved = &sKey event.StateKeyResolved = &sKeyUser
}
} }
} }
prevEvent, err := snapshot.GetStateEvent(
s.ctx, event.RoomID(), event.Type(), sKeyUser,
)
if err != nil {
return event, err
}
userID, err := s.rsAPI.QueryUserIDForSender(s.ctx, *validRoomID, event.SenderID()) userID, err := s.rsAPI.QueryUserIDForSender(s.ctx, *validRoomID, event.SenderID())
if err != nil { if err != nil {
return event, err return event, err