sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Only return non-stub rooms from GetKnownRooms (#2049)

Browse source 
* Only return non-stub rooms from `GetKnownRooms`

This should stop a bunch of errors at startup with invalid server ACLs.

* Fix query
This commit is contained in:
Neil Alexander 2021-11-18 11:34:19 +00:00 committed by GitHub
parent e81ef1649b
commit 403498a85b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/storage/postgres/rooms_table.go
View file

@ -74,7 +74,7 @@ const selectRoomInfoSQL = "" +
"SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1" "SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1"
const selectRoomIDsSQL = "" + const selectRoomIDsSQL = "" +
"SELECT room_id FROM roomserver_rooms" "SELECT room_id FROM roomserver_rooms WHERE array_length(latest_event_nids, 1) > 0"
const bulkSelectRoomIDsSQL = "" + const bulkSelectRoomIDsSQL = "" +
"SELECT room_id FROM roomserver_rooms WHERE room_nid = ANY($1)" "SELECT room_id FROM roomserver_rooms WHERE room_nid = ANY($1)"

2
roomserver/storage/sqlite3/rooms_table.go
View file

@ -65,7 +65,7 @@ const selectRoomInfoSQL = "" +
"SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1" "SELECT room_version, room_nid, state_snapshot_nid, latest_event_nids FROM roomserver_rooms WHERE room_id = $1"
const selectRoomIDsSQL = "" + const selectRoomIDsSQL = "" +
"SELECT room_id FROM roomserver_rooms" "SELECT room_id FROM roomserver_rooms WHERE latest_event_nids != '[]'"
const bulkSelectRoomIDsSQL = "" + const bulkSelectRoomIDsSQL = "" +
"SELECT room_id FROM roomserver_rooms WHERE room_nid IN ($1)" "SELECT room_id FROM roomserver_rooms WHERE room_nid IN ($1)"