Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Make room directory search case insensitive #6268

Merged
merged 4 commits into from
Oct 29, 2019
Merged

Make room directory search case insensitive #6268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
342d871
Make room directory search case insensitive
erikjohnston Oct 29, 2019
b7a0ea6
Newsfile
erikjohnston Oct 29, 2019
c28a30d
Pin black version
erikjohnston Oct 29, 2019
9d8dc85
Add comment as to why we're pinning black in tests
erikjohnston Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6286.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug where room directory search was case sensitive.
12 changes: 8 additions & 4 deletions synapse/storage/data_stores/main/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,17 @@ def get_largest_public_rooms(
where_clauses.append(
"""
(
name LIKE ?
OR topic LIKE ?
OR canonical_alias LIKE ?
LOWER(name) LIKE ?
OR LOWER(topic) LIKE ?
OR LOWER(canonical_alias) LIKE ?
)
"""
)
query_args += [search_term, search_term, search_term]
query_args += [
search_term.lower(),
search_term.lower(),
search_term.lower(),
]

where_clause = ""
if where_clauses:
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ skip_install = True
basepython = python3.6
deps =
flake8
black
black==19.3b0 # We pin so that our tests don't start failing on new releases of black.
commands =
python -m black --check --diff .
/bin/sh -c "flake8 synapse tests scripts scripts-dev scripts/hash_password scripts/register_new_matrix_user scripts/synapse_port_db synctl {env:PEP8SUFFIX:}"
Expand Down