From 6881b6a6f16abc264369d689ff7fdf6191e3f85a Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 10 Sep 2020 15:14:14 +0100 Subject: [PATCH] Don't force federated join for possibly even local invites --- roomserver/internal/perform/perform_join.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index bd279bbc9..f76806c73 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -192,7 +192,6 @@ func (r *Joiner) performJoinRoomByID( // and we aren't in the room. isInvitePending, inviteSender, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomIDOrAlias, req.UserID) if err == nil && isInvitePending { - forceFederatedJoin = true _, inviterDomain, ierr := gomatrixserverlib.SplitID('@', inviteSender) if ierr != nil { return "", fmt.Errorf("gomatrixserverlib.SplitID: %w", err) @@ -202,6 +201,7 @@ func (r *Joiner) performJoinRoomByID( // assume they are in the room so we can join via them. if inviterDomain != r.Cfg.Matrix.ServerName { req.ServerNames = append(req.ServerNames, inviterDomain) + forceFederatedJoin = true } }