tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Add basic filtering support

Browse source
This commit is contained in:
Mark Haines 2015-01-29 18:11:28 +00:00
parent 7ceda8bf3d
commit 365a186729
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
synapse/rest/client/v2_alpha/sync.py
View file

@ -21,6 +21,7 @@ from synapse.types import StreamToken
from synapse.events.utils import ( from synapse.events.utils import (
serialize_event, format_event_for_client_v2_without_event_id, serialize_event, format_event_for_client_v2_without_event_id,
) )
from synapse.api.filtering import Filter
from ._base import client_v2_pattern from ._base import client_v2_pattern
import logging import logging
@ -80,6 +81,7 @@ class SyncRestServlet(RestServlet):
self.auth = hs.get_auth() self.auth = hs.get_auth()
self.sync_handler = hs.get_handlers().sync_handler self.sync_handler = hs.get_handlers().sync_handler
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.filtering = hs.get_filtering()
@defer.inlineCallbacks @defer.inlineCallbacks
def on_GET(self, request): def on_GET(self, request):
@ -109,9 +111,14 @@ class SyncRestServlet(RestServlet):
) )
# TODO(mjark): Load filter and apply overrides. # TODO(mjark): Load filter and apply overrides.
# filter = self.filters.load_fitler(filter_id_str) try:
filter = yield self.filtering.get_user_filter(
user.localpart, filter_id
)
except:
filter = Filter({})
# filter = filter.apply_overrides(http_request) # filter = filter.apply_overrides(http_request)
# if filter.matches(event): #if filter.matches(event):
# # stuff # # stuff
sync_config = SyncConfig( sync_config = SyncConfig(
@ -121,7 +128,7 @@ class SyncRestServlet(RestServlet):
limit=limit, limit=limit,
sort=sort, sort=sort,
backfill=backfill, backfill=backfill,
filter="TODO", # TODO(mjark) Add the filter to the config. filter=filter,
) )
if since is not None: if since is not None:
@ -162,9 +169,11 @@ class SyncRestServlet(RestServlet):
@staticmethod @staticmethod
def encode_room(room, filter, time_now, token_id): def encode_room(room, filter, time_now, token_id):
event_map = {} event_map = {}
state_events = filter.filter_room_state(room.state)
recent_events = filter.filter_room_events(room.events)
state_event_ids = [] state_event_ids = []
recent_event_ids = [] recent_event_ids = []
for event in room.state: for event in state_events:
# TODO(mjark): Respect formatting requirements in the filter. # TODO(mjark): Respect formatting requirements in the filter.
event_map[event.event_id] = serialize_event( event_map[event.event_id] = serialize_event(
event, time_now, token_id=token_id, event, time_now, token_id=token_id,
@ -172,7 +181,7 @@ class SyncRestServlet(RestServlet):
) )
state_event_ids.append(event.event_id) state_event_ids.append(event.event_id)
for event in room.events: for event in recent_events:
# TODO(mjark): Respect formatting requirements in the filter. # TODO(mjark): Respect formatting requirements in the filter.
event_map[event.event_id] = serialize_event( event_map[event.event_id] = serialize_event(
event, time_now, token_id=token_id, event, time_now, token_id=token_id,