hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-26 15:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to find new servers to federated join via

Browse source
This commit is contained in:
Neil Alexander 2021-11-15 16:03:06 +00:00
parent f7c3f75e48
commit 2d91fe0df1
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,10 +259,35 @@ func (r *Joiner) performJoinRoomByID(
}
}
if !success {
return "", "", &api.PerformError{
Code: rsAPI.PerformErrorBadRequest,
Msg: fmt.Sprintf("Can't satisfy restricted join to room %q locally", req.RoomIDOrAlias),
queryReq := &api.QueryMembershipsForRoomRequest{}
queryRes := &api.QueryMembershipsForRoomResponse{}
if err = r.RSAPI.QueryMembershipsForRoom(ctx, queryReq, queryRes); err != nil {
return "", "", &api.PerformError{
Code: rsAPI.PerformErrorBadRequest,
Msg: fmt.Sprintf("Can't satisfy restricted join to room %q locally: %s", req.RoomIDOrAlias, err),
}
}
var serverName gomatrixserverlib.ServerName
joinEvents:
for _, q := range queryRes.JoinEvents {
_, serverName, err = gomatrixserverlib.SplitID('@', *q.StateKey)
if err != nil {
continue
}
for _, s := range req.ServerNames {
if s == r.Cfg.Matrix.ServerName {
continue
}
if s == serverName {
continue joinEvents
}
}
req.ServerNames = append(req.ServerNames, serverName)
}
joinedVia, err = r.performFederatedJoinRoomByID(ctx, req)
return req.RoomIDOrAlias, joinedVia, err
}
}