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

delete properly

Browse source
This commit is contained in:
Kegan Dougal 2021-03-08 17:52:59 +00:00
parent 5b7468263e
commit 8f5eb0c904
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/internal/perform/perform_join.go
View file

@ -153,10 +153,11 @@ func (r *Joiner) performJoinRoomByID(
) (string, gomatrixserverlib.ServerName, error) { ) (string, gomatrixserverlib.ServerName, error) {
// The original client request ?server_name=... may include this HS so filter that out so we // The original client request ?server_name=... may include this HS so filter that out so we
// don't attempt to make_join with ourselves // don't attempt to make_join with ourselves
for i, srv := range req.ServerNames { for i := 0; i < len(req.ServerNames); i++ {
if srv == r.Cfg.Matrix.ServerName { if req.ServerNames[i] == r.Cfg.Matrix.ServerName {
// delete this entry // delete this entry
req.ServerNames = append(req.ServerNames[:i], req.ServerNames[i+1:]...) req.ServerNames = append(req.ServerNames[:i], req.ServerNames[i+1:]...)
i--
} }
} }