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

Fix a bug introduced in Synapse v1.74.0 where searching with colons when using ICU for search term tokenisation would fail with an error. #15079

Merged
merged 9 commits into from
Feb 20, 2023
Merged

Fix a bug introduced in Synapse v1.74.0 where searching with colons when using ICU for search term tokenisation would fail with an error. #15079

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ce55f5
Add failing test
reivilibre Feb 15, 2023
b312e6d
Small rename of variables
reivilibre Feb 15, 2023
2085a40
Add minitests to characterise how we do tokenisation today
reivilibre Feb 15, 2023
bc5c511
Add escaping to our tsquery builder
reivilibre Feb 15, 2023
a19355b
Test that we can find a user by prefix of MXID
reivilibre Feb 15, 2023
30c722a
Newsfile
reivilibre Feb 15, 2023
68d3c64
Loosen test to accept at least 2 versions of ICU
reivilibre Feb 16, 2023
e5c2c78
Update tests/handlers/test_user_directory.py
reivilibre Feb 17, 2023
ef37452
Let the tests run on both ICU and non-ICU
reivilibre Feb 17, 2023
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
15 changes: 14 additions & 1 deletion tests/storage/test_user_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
BOB = "@bob:b"
BOBBY = "@bobby:a"
# The localpart isn't 'Bela' on purpose so we can test looking up display names.
BELA = "@somenickname:a"
BELA = "@somenickname:example.org"


class GetUserDirectoryTables:
Expand Down Expand Up @@ -482,6 +482,19 @@ def test_search_user_dir_stop_words(self) -> None:
{"user_id": BELA, "display_name": "Bela", "avatar_url": None},
)

@override_config({"user_directory": {"search_all_users": True}})
def test_search_user_dir_start_of_user_id(self) -> None:
"""Tests that a user can look up another user by searching for the start
of their user ID.
"""
r = self.get_success(self.store.search_user_dir(ALICE, "somenickname:exa", 10))
self.assertFalse(r["limited"])
self.assertEqual(1, len(r["results"]))
self.assertDictEqual(
r["results"][0],
{"user_id": BELA, "display_name": "Bela", "avatar_url": None},
)

Comment on lines +494 to +506
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this test (and any others) running under with-ICU and without-ICU? (Should it?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now it is :)


class UserDirectoryICUTestCase(HomeserverTestCase):
if not icu:
Expand Down