mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix and remove another needless query

Browse source
This commit is contained in:
Kegan Dougal 2020-08-28 18:41:00 +01:00
parent 63c0819e65
commit cd7ab95dfe
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/internal/perform_invite.go
View file

@ -208,13 +208,9 @@ func buildInviteStrippedState(
StateKey: "", StateKey: "",
}) })
} }
_, currentStateSnapshotNID, _, err := db.LatestEventIDs(ctx, info.RoomNID)
if err != nil {
return nil, err
}
roomState := state.NewStateResolution(db) roomState := state.NewStateResolution(db)
stateEntries, err := roomState.LoadStateAtSnapshotForStringTuples( stateEntries, err := roomState.LoadStateAtSnapshotForStringTuples(
ctx, currentStateSnapshotNID, stateWanted, ctx, info.StateSnapshotNID, stateWanted,
) )
if err != nil { if err != nil {
return nil, err return nil, err

3
roomserver/internal/query.go
View file

@ -559,6 +559,9 @@ func (r *RoomserverInternalAPI) isServerCurrentlyInRoom(ctx context.Context, ser
if err != nil { if err != nil {
return false, err return false, err
} }
if info == nil {
return false, fmt.Errorf("unknown room %s", roomID)
}
eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, false) eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, false)
if err != nil { if err != nil {