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

Revert "Persist the federated invite event so we have a NID,"

Browse source 
This reverts commit fde0c3a2c7.
This commit is contained in:
Neil Alexander 2022-07-22 17:02:58 +01:00
parent fde0c3a2c7
commit 406dee56fe
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roomserver/internal/perform/perform_invite.go
View file

@ -107,19 +107,13 @@ func (r *Inviter) PerformInvite(
} }
updateMembershipTableManually := func() ([]api.OutputEvent, error) { updateMembershipTableManually := func() ([]api.OutputEvent, error) {
event := event.Unwrap()
var eventNID types.EventNID
eventNID, _, _, _, _, err = r.DB.StoreEvent(ctx, event, nil, false)
if err != nil {
return nil, fmt.Errorf("r.DB.StoreEvent: %w", err)
}
var updater *shared.MembershipUpdater var updater *shared.MembershipUpdater
if updater, err = r.DB.MembershipUpdater(ctx, roomID, targetUserID, isTargetLocal, req.RoomVersion); err != nil { if updater, err = r.DB.MembershipUpdater(ctx, roomID, targetUserID, isTargetLocal, req.RoomVersion); err != nil {
return nil, fmt.Errorf("r.DB.MembershipUpdater: %w", err) return nil, fmt.Errorf("r.DB.MembershipUpdater: %w", err)
} }
outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{ outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{
EventNID: eventNID, EventNID: 0,
Event: event, Event: event.Unwrap(),
}, outputUpdates, req.Event.RoomVersion) }, outputUpdates, req.Event.RoomVersion)
if err != nil { if err != nil {
return nil, fmt.Errorf("updateToInviteMembership: %w", err) return nil, fmt.Errorf("updateToInviteMembership: %w", err)

3
roomserver/storage/tables/membership_table_test.go
View file

@ -60,9 +60,6 @@ func TestMembershipTable(t *testing.T) {
// This inserts a left user to the room // This inserts a left user to the room
err = tab.InsertMembership(ctx, nil, 1, stateKeyNID, true) err = tab.InsertMembership(ctx, nil, 1, stateKeyNID, true)
assert.NoError(t, err) assert.NoError(t, err)
// We must update the membership with a non-zero event NID or it will get filtered out in later queries
_, err = tab.UpdateMembership(ctx, nil, 1, stateKeyNID, userNIDs[0], tables.MembershipStateLeaveOrBan, 1, false)
assert.NoError(t, err)
} }
// ... so this should be false // ... so this should be false