diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-24 16:23:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-24 16:23:55 +0100 |
| commit | 61f36d9939e7fb3b7c977d2ce334b3610535d86c (patch) | |
| tree | dcc9be8eb8b9fa719843baa844340e629b1b8cb7 /synapse/handlers | |
| parent | Don't insert events into 'event_*_extremeties' tables if they're outliers (diff) | |
| parent | Don't make pushers handle presence/typing events (diff) | |
| download | synapse-61f36d9939e7fb3b7c977d2ce334b3610535d86c.tar.xz | |
Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events
Don't make pushers handle presence/typing events
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/events.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index f9ca2f8634..891502c04f 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -49,7 +49,12 @@ class EventStreamHandler(BaseHandler): @defer.inlineCallbacks @log_function def get_stream(self, auth_user_id, pagin_config, timeout=0, - as_client_event=True, affect_presence=True): + as_client_event=True, affect_presence=True, + only_room_events=False): + """Fetches the events stream for a given user. + + If `only_room_events` is `True` only room events will be returned. + """ auth_user = UserID.from_string(auth_user_id) try: @@ -89,7 +94,8 @@ class EventStreamHandler(BaseHandler): timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) events, tokens = yield self.notifier.get_events_for( - auth_user, room_ids, pagin_config, timeout + auth_user, room_ids, pagin_config, timeout, + only_room_events=only_room_events ) time_now = self.clock.time_msec() |