mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix shadowing

Browse source
This commit is contained in:
Kegan Dougal 2023-04-27 14:32:48 +01:00
parent cb07659d54
commit 0156982b96
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/internal/query/query.go
View file

@ -588,11 +588,11 @@ func (r *Queryer) QueryStateAndAuthChain(
} }
if request.ResolveState { if request.ResolveState {
stateEventsPDU, err := gomatrixserverlib.ResolveConflicts( stateEventsPDU, err2 := gomatrixserverlib.ResolveConflicts(
info.RoomVersion, gomatrixserverlib.ToPDUs(stateEvents), gomatrixserverlib.ToPDUs(authEvents), info.RoomVersion, gomatrixserverlib.ToPDUs(stateEvents), gomatrixserverlib.ToPDUs(authEvents),
) )
if err != nil { if err2 != nil {
return err return err2
} }
stateEvents = gomatrixserverlib.TempCastToEvents(stateEventsPDU) stateEvents = gomatrixserverlib.TempCastToEvents(stateEventsPDU)
} }