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

Fix oops

Browse source
This commit is contained in:
Till Faelligen 2022-11-07 10:09:00 +01:00
parent 2aa90266c2
commit 22c5646b45
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/internal/input/input_events.go
View file

@ -414,7 +414,7 @@ func (r *Inputer) processRoomEvent(
// Handle remote room upgrades, e.g. remove published room
if event.Type() == "m.room.tombstone" && event.StateKeyEquals("") && !r.Cfg.Matrix.IsLocalServerName(senderDomain) {
if err = r.handleRemoteRoomUpgrade(ctx, event); err != nil {
return fmt.Errorf("failed to handle remote room upgrade: %w")
return fmt.Errorf("failed to handle remote room upgrade: %w", err)
}
}

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

@ -1406,7 +1406,7 @@ func (d *Database) UpgradeRoom(ctx context.Context, oldRoomID, newRoomID, eventS
for _, alias := range aliases {
if err = d.RoomAliasesTable.DeleteRoomAlias(ctx, txn, alias); err != nil {
fmt.Errorf("failed to remove room alias: %w", err)
return fmt.Errorf("failed to remove room alias: %w", err)
}
if err = d.RoomAliasesTable.InsertRoomAlias(ctx, txn, alias, newRoomID, eventSender); err != nil {
return fmt.Errorf("failed to set room alias: %w", err)