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

Fix up rejecting invites over federation

Browse source
This commit is contained in:
Kegan Dougal 2020-09-07 11:51:45 +01:00
parent 57e0d82959
commit cdd63176e9
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,9 @@ func (r *Queryer) QueryMembershipForUser(
if err != nil { if err != nil {
return err return err
} }
if info == nil {
return fmt.Errorf("QueryMembershipForUser: unknown room %s", request.RoomID)
}
membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, info.RoomNID, request.UserID) membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, info.RoomNID, request.UserID)
if err != nil { if err != nil {

4
roomserver/storage/shared/storage.go
View file

@ -843,6 +843,10 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
if err2 != nil { if err2 != nil {
return nil, fmt.Errorf("GetBulkStateContent: failed to load room info for room %s : %w", roomID, err2) return nil, fmt.Errorf("GetBulkStateContent: failed to load room info for room %s : %w", roomID, err2)
} }
// for unknown rooms or rooms which we don't have the current state, skip them.
if roomInfo == nil || roomInfo.IsStub {
continue
}
entries, err2 := d.loadStateAtSnapshot(ctx, roomInfo.StateSnapshotNID) entries, err2 := d.loadStateAtSnapshot(ctx, roomInfo.StateSnapshotNID)
if err2 != nil { if err2 != nil {
return nil, fmt.Errorf("GetBulkStateContent: failed to load state for room %s : %w", roomID, err2) return nil, fmt.Errorf("GetBulkStateContent: failed to load state for room %s : %w", roomID, err2)