From a35718cd843d82dfc032688a7a8812002c4409f3 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 16 Nov 2021 15:56:31 +0000 Subject: [PATCH] Only return non-stub rooms from `GetKnownRooms` This should stop a bunch of errors at startup with invalid server ACLs. --- roomserver/storage/postgres/rooms_table.go | 2 +- roomserver/storage/sqlite3/rooms_table.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go index ba8eb671b..f51eba4d4 100644 --- a/roomserver/storage/postgres/rooms_table.go +++ b/roomserver/storage/postgres/rooms_table.go @@ -74,7 +74,7 @@ const selectRoomInfoSQL = "" + "SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1" const selectRoomIDsSQL = "" + - "SELECT room_id FROM roomserver_rooms" + "SELECT room_id FROM roomserver_rooms WHERE array_length(latest_event_nids, 1) > 0" const bulkSelectRoomIDsSQL = "" + "SELECT room_id FROM roomserver_rooms WHERE room_nid = ANY($1)" diff --git a/roomserver/storage/sqlite3/rooms_table.go b/roomserver/storage/sqlite3/rooms_table.go index 2dfb830d8..beb8bc2c0 100644 --- a/roomserver/storage/sqlite3/rooms_table.go +++ b/roomserver/storage/sqlite3/rooms_table.go @@ -65,7 +65,7 @@ const selectRoomInfoSQL = "" + "SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1" const selectRoomIDsSQL = "" + - "SELECT room_id FROM roomserver_rooms" + "SELECT room_id, latest_event_nids FROM roomserver_rooms WHERE latest_event_nids != '[]'" const bulkSelectRoomIDsSQL = "" + "SELECT room_id FROM roomserver_rooms WHERE room_nid IN ($1)"