1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-26 05:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix joins to rooms that we know about that have room IDs with our server part (#1178)

Browse Source
This commit is contained in:
Neil Alexander 2020-07-03 10:25:26 +01:00 committed by GitHub
parent 38caf8e5b7
commit 9dffeb9b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
roomserver/internal/perform_join.go
View File

@ -124,7 +124,13 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
Msg: fmt.Sprintf("Room ID %q is invalid: %s", req.RoomIDOrAlias, err), Msg: fmt.Sprintf("Room ID %q is invalid: %s", req.RoomIDOrAlias, err),
} }
} }
req.ServerNames = append(req.ServerNames, domain)
// If the server name in the room ID isn't ours then it's a
// possible candidate for finding the room via federation. Add
// it to the list of servers to try.
if domain != r.Cfg.Matrix.ServerName {
req.ServerNames = append(req.ServerNames, domain)
}
// Prepare the template for the join event. // Prepare the template for the join event.
userID := req.UserID userID := req.UserID
@ -233,13 +239,18 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
} }
case eventutil.ErrRoomNoExists: case eventutil.ErrRoomNoExists:
// The room doesn't exist. First of all check if the room is a local // The room doesn't exist locally. If the room ID looks like it should
// room. If it is then there's nothing more to do - the room just // be ours then this probably means that we've nuked our database at
// hasn't been created yet. // some point.
if domain == r.Cfg.Matrix.ServerName { if domain == r.Cfg.Matrix.ServerName {
return "", &api.PerformError{ // If there are no more server names to try then give up here.
Code: api.PerformErrorNoRoom, // Otherwise we'll try a federated join as normal, since it's quite
Msg: fmt.Sprintf("Room ID %q does not exist", req.RoomIDOrAlias), // possible that the room still exists on other servers.
if len(req.ServerNames) == 0 {
return "", &api.PerformError{
Code: api.PerformErrorNoRoom,
Msg: fmt.Sprintf("Room ID %q does not exist", req.RoomIDOrAlias),
}
} }
} }