diff --git a/tests/rest/client/test_rooms.py b/tests/rest/client/test_rooms.py
index 0e71cdcd88..89b161dd0a 100644
--- a/tests/rest/client/test_rooms.py
+++ b/tests/rest/client/test_rooms.py
@@ -2155,6 +2155,33 @@ class RoomMessageListTestCase(RoomBase):
self.assertEqual(len(chunk), 0, [event["content"] for event in chunk])
+class RoomMessageFilterTestCase(RoomBase):
+ """Tests /rooms/$room_id/messages REST events."""
+
+ user_id = "@sid1:red"
+
+ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
+ self.room_id = self.helper.create_room_as(self.user_id)
+
+ def test_room_message_filter_wildcard(self) -> None:
+ # Send a first message in the room, which will be removed by the purge.
+ self.helper.send(self.room_id, "message 1", type="f.message.1")
+ self.helper.send(self.room_id, "message 1", type="f.message.2")
+ self.helper.send(self.room_id, "not returned in filter")
+ channel = self.make_request(
+ "GET",
+ "/rooms/%s/messages?access_token=x&dir=b&filter=%s"
+ % (
+ self.room_id,
+ json.dumps({"types": ["f.message.*"]}),
+ ),
+ )
+ self.assertEqual(channel.code, HTTPStatus.OK, channel.json_body)
+
+ chunk = channel.json_body["chunk"]
+ self.assertEqual(len(chunk), 2, [event["content"] for event in chunk])
+
+
class RoomSearchTestCase(unittest.HomeserverTestCase):
servlets = [
synapse.rest.admin.register_servlets_for_client_rest_resource,
diff --git a/tests/rest/client/utils.py b/tests/rest/client/utils.py
index 7bcbed246b..3bf3663e3a 100644
--- a/tests/rest/client/utils.py
+++ b/tests/rest/client/utils.py
@@ -364,6 +364,7 @@ class RestHelper:
tok: Optional[str] = None,
expect_code: int = HTTPStatus.OK,
custom_headers: Optional[Iterable[Tuple[AnyStr, AnyStr]]] = None,
+ type: str = "m.room.message",
) -> JsonDict:
if body is None:
body = "body_text_here"
@@ -372,7 +373,7 @@ class RestHelper:
return self.send_event(
room_id,
- "m.room.message",
+ type,
content,
txn_id,
tok,
|
