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

Let us try this one more time

Browse source
This commit is contained in:
Neil Alexander 2022-10-10 16:23:09 +01:00
parent aef6187da6
commit 8b6b0fba8c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
federationapi/storage/shared/storage.go
View file

@ -68,7 +68,6 @@ func (d *Database) UpdateRoom(
removeHosts []string, removeHosts []string,
purgeRoomFirst bool, purgeRoomFirst bool,
) (joinedHosts []types.JoinedHost, err error) { ) (joinedHosts []types.JoinedHost, err error) {
returnHosts := map[string]types.JoinedHost{}
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
if purgeRoomFirst { if purgeRoomFirst {
// If the event is a create event then we'll delete all of the existing // If the event is a create event then we'll delete all of the existing
@ -77,34 +76,21 @@ func (d *Database) UpdateRoom(
if err = d.FederationJoinedHosts.DeleteJoinedHostsForRoom(ctx, txn, roomID); err != nil { if err = d.FederationJoinedHosts.DeleteJoinedHostsForRoom(ctx, txn, roomID); err != nil {
return fmt.Errorf("d.FederationJoinedHosts.DeleteJoinedHosts: %w", err) return fmt.Errorf("d.FederationJoinedHosts.DeleteJoinedHosts: %w", err)
} }
} else { } else if len(removeHosts) > 0 {
if joinedHosts, err = d.FederationJoinedHosts.SelectJoinedHostsWithTx(ctx, txn, roomID); err != nil {
return err
}
for _, add := range joinedHosts {
returnHosts[string(add.ServerName)] = add
}
if len(removeHosts) > 0 {
if err = d.FederationJoinedHosts.DeleteJoinedHosts(ctx, txn, removeHosts); err != nil { if err = d.FederationJoinedHosts.DeleteJoinedHosts(ctx, txn, removeHosts); err != nil {
return err return err
} }
for _, remove := range removeHosts {
delete(returnHosts, remove)
}
}
} }
for _, add := range addHosts { for _, add := range addHosts {
err = d.FederationJoinedHosts.InsertJoinedHosts(ctx, txn, roomID, add.MemberEventID, add.ServerName) if err = d.FederationJoinedHosts.InsertJoinedHosts(ctx, txn, roomID, add.MemberEventID, add.ServerName); err != nil {
if err != nil {
return err return err
} }
returnHosts[string(add.ServerName)] = add }
if joinedHosts, err = d.FederationJoinedHosts.SelectJoinedHostsWithTx(ctx, txn, roomID); err != nil {
return err
} }
return nil return nil
}) })
for _, host := range returnHosts {
joinedHosts = append(joinedHosts, host)
}
return return
} }