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

Don't return error if the state event fails

Browse source
This commit is contained in:
Neil Alexander 2021-07-21 15:06:19 +01:00
parent aeecedefe7
commit 4105afd4dd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
roomserver/internal/alias.go
View file

@ -77,7 +77,15 @@ func (r *RoomserverInternalAPI) SetRoomAlias(
// At this point we've already committed the alias to the database so we // At this point we've already committed the alias to the database so we
// shouldn't cancel this request. // shouldn't cancel this request.
// TODO: Ensure that we send unsent events when if server restarts. // TODO: Ensure that we send unsent events when if server restarts.
return r.sendUpdatedAliasesEvent(context.TODO(), request.UserID, request.RoomID) //
// From: https://spec.matrix.org/unstable/client-server-api/#delete_matrixclientr0directoryroomroomalias
// Note: Servers may choose to update the alt_aliases for the m.room.canonical_alias
// state event in the room when an alias is removed. Servers which choose to update
// the canonical alias event are recommended to, in addition to their other relevant
// permission checks, delete the alias and return a successful response even if the
// user does not have permission to update the m.room.canonical_alias event.
_ = r.sendUpdatedAliasesEvent(context.TODO(), request.UserID, roomID)
return nil
} }
// GetRoomIDForAlias implements alias.RoomserverInternalAPI // GetRoomIDForAlias implements alias.RoomserverInternalAPI
@ -172,7 +180,15 @@ func (r *RoomserverInternalAPI) RemoveRoomAlias(
// At this point we've already committed the alias to the database so we // At this point we've already committed the alias to the database so we
// shouldn't cancel this request. // shouldn't cancel this request.
// TODO: Ensure that we send unsent events when if server restarts. // TODO: Ensure that we send unsent events when if server restarts.
return r.sendUpdatedAliasesEvent(context.TODO(), request.UserID, roomID) //
// From: https://spec.matrix.org/unstable/client-server-api/#delete_matrixclientr0directoryroomroomalias
// Note: Servers may choose to update the alt_aliases for the m.room.canonical_alias
// state event in the room when an alias is removed. Servers which choose to update
// the canonical alias event are recommended to, in addition to their other relevant
// permission checks, delete the alias and return a successful response even if the
// user does not have permission to update the m.room.canonical_alias event.
_ = r.sendUpdatedAliasesEvent(context.TODO(), request.UserID, roomID)
return nil
} }
type roomAliasesContent struct { type roomAliasesContent struct {