Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into markjh/guest_access

Browse Source 
Conflicts:
	synapse/api/filtering.py
This commit is contained in:
Mark Haines 2015-12-22 13:58:18 +00:00
commit c058625959
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/api/filtering.py
View File

@ -70,6 +70,11 @@ class Filtering(object):
def _check_definition_room_lists(self, definition): def _check_definition_room_lists(self, definition):
"""Check that "rooms" and "not_rooms" are lists of room ids if they """Check that "rooms" and "not_rooms" are lists of room ids if they
are present are present
Args:
definition(dict): The filter definition
Raises:
SynapseError: If there was a problem with this definition.
""" """
# check rooms are valid room IDs # check rooms are valid room IDs
room_id_keys = ["rooms", "not_rooms"] room_id_keys = ["rooms", "not_rooms"]