diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-22 13:58:18 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-22 13:58:18 +0000 |
| commit | c058625959dd45f09f1838b4d7e98e4d73c193cf (patch) | |
| tree | be6fa0a73eebdb4b65b0e183d78130dc40923226 | |
| parent | Hook up read receipts and typing notifications for guest access (diff) | |
| parent | Merge pull request #454 from matrix-org/markjh/room_filtering (diff) | |
| download | synapse-c058625959dd45f09f1838b4d7e98e4d73c193cf.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/guest_access
Conflicts: synapse/api/filtering.py
| -rw-r--r-- | synapse/api/filtering.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 8c8c7b642e..5287aaa757 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -70,6 +70,11 @@ class Filtering(object): def _check_definition_room_lists(self, definition): """Check that "rooms" and "not_rooms" are lists of room ids if they are present + + Args: + definition(dict): The filter definition + Raises: + SynapseError: If there was a problem with this definition. """ # check rooms are valid room IDs room_id_keys = ["rooms", "not_rooms"] |