From c75c547b46418e8652ba7d3f51f95a944260972a Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 19 Mar 2020 15:32:02 +0000 Subject: [PATCH] Fix room joins over federation --- roomserver/query/query.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roomserver/query/query.go b/roomserver/query/query.go index 9f3f44198..94f8d97fe 100644 --- a/roomserver/query/query.go +++ b/roomserver/query/query.go @@ -108,7 +108,8 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState( ) error { roomVersion, err := r.DB.GetRoomVersionForRoom(ctx, request.RoomID) if err != nil { - return err + response.RoomExists = false + return nil } roomState := state.Prepare(r.DB) @@ -158,7 +159,8 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents( ) error { roomVersion, err := r.DB.GetRoomVersionForRoom(ctx, request.RoomID) if err != nil { - return err + response.RoomExists = false + return nil } roomState := state.Prepare(r.DB)