From 436c0aafc5c0c89e000ae029feaf52aa8d73192b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 9 Sep 2020 18:23:20 +0100 Subject: [PATCH] Remove extra room check, it seems to break the whole damn world --- roomserver/internal/perform/perform_join.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 648e729ec..3d1942272 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -25,7 +25,6 @@ import ( "github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/internal/eventutil" "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/dendrite/roomserver/auth" "github.com/matrix-org/dendrite/roomserver/internal/helpers" "github.com/matrix-org/dendrite/roomserver/internal/input" "github.com/matrix-org/dendrite/roomserver/storage" @@ -335,20 +334,6 @@ func buildEvent( return nil, nil, fmt.Errorf("QueryLatestEventsAndState: %w", err) } - // If we know about any membership events in this room, check and see - // if we still believe any of our users to be in the room. If not, then - // returning that the room doesn't exist will kick the room join over - // to a federated join. If we don't know about any of the membership - // events then it's probably a new local room so do nothing. - for _, ev := range queryRes.StateEvents { - if ev.Type() == gomatrixserverlib.MRoomMember { - if !auth.IsAnyUserOnServerWithMembership(cfg.ServerName, gomatrixserverlib.UnwrapEventHeaders(queryRes.StateEvents), "join") { - return nil, nil, eventutil.ErrRoomNoExists - } - break - } - } - ev, err := eventutil.BuildEvent(ctx, builder, cfg, time.Now(), &eventsNeeded, &queryRes) if err != nil { return nil, nil, err