Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable

Fix not showing non-federatable rooms to remote room list queries
This commit is contained in:
Erik Johnston 2019-10-02 16:09:15 +01:00 committed by GitHub
commit 22a6ffdf91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

1
changelog.d/6153.misc Normal file
View File

@ -0,0 +1 @@
Improve performance of the public room list directory.

View File

@ -174,6 +174,9 @@ class RoomWorkerStore(SQLBaseStore):
query_args += [last_joined_members, last_joined_members, last_room_id] query_args += [last_joined_members, last_joined_members, last_room_id]
if ignore_non_federatable:
where_clauses.append("is_federatable")
if search_filter and search_filter.get("generic_search_term", None): if search_filter and search_filter.get("generic_search_term", None):
search_term = "%" + search_filter["generic_search_term"] + "%" search_term = "%" + search_filter["generic_search_term"] + "%"