Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-09-15 17:55:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix code-style

Browse source
This commit is contained in:
Mark Haines 2015-01-29 16:01:14 +00:00
parent 33391db5f8
commit 9150a0d62e
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
synapse/api/filtering.py
View file

@ -74,7 +74,7 @@ class Filtering(object):
defer.returnValue(self._filter_with_definition(events, definition)) defer.returnValue(self._filter_with_definition(events, definition))
except KeyError: except KeyError:
# return all events if definition isn't specified. # return all events if definition isn't specified.
defer.returnValue(events) defer.returnValue(events)
def _filter_with_definition(self, events, definition): def _filter_with_definition(self, events, definition):
return [e for e in events if self._passes_definition(definition, e)] return [e for e in events if self._passes_definition(definition, e)]
@ -94,14 +94,12 @@ class Filtering(object):
# * For senders/rooms: Literal match only # * For senders/rooms: Literal match only
# * "not_" checks take presedence (e.g. if "m.*" is in both 'types' # * "not_" checks take presedence (e.g. if "m.*" is in both 'types'
# and 'not_types' then it is treated as only being in 'not_types') # and 'not_types' then it is treated as only being in 'not_types')
# room checks # room checks
if hasattr(event, "room_id"): if hasattr(event, "room_id"):
room_id = event.room_id room_id = event.room_id
allow_rooms = definition["rooms"] if "rooms" in definition else None allow_rooms = definition.get("rooms", None)
reject_rooms = ( reject_rooms = definition.get("not_rooms", None)
definition["not_rooms"] if "not_rooms" in definition else None
)
if reject_rooms and room_id in reject_rooms: if reject_rooms and room_id in reject_rooms:
return False return False
if allow_rooms and room_id not in allow_rooms: if allow_rooms and room_id not in allow_rooms:
@ -111,12 +109,8 @@ class Filtering(object):
if hasattr(event, "sender"): if hasattr(event, "sender"):
# Should we be including event.state_key for some event types? # Should we be including event.state_key for some event types?
sender = event.sender sender = event.sender
allow_senders = ( allow_senders = definition.get("senders", None)
definition["senders"] if "senders" in definition else None reject_senders = definition.get("not_senders", None)
)
reject_senders = (
definition["not_senders"] if "not_senders" in definition else None
)
if reject_senders and sender in reject_senders: if reject_senders and sender in reject_senders:
return False return False
if allow_senders and sender not in allow_senders: if allow_senders and sender not in allow_senders:
@ -176,7 +170,6 @@ class Filtering(object):
if key in user_filter["room"]: if key in user_filter["room"]:
self._check_definition(user_filter["room"][key]) self._check_definition(user_filter["room"][key])
def _check_definition(self, definition): def _check_definition(self, definition):
"""Check if the provided definition is valid. """Check if the provided definition is valid.