diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
| commit | f4dad9f63995c8aa493ef884f793ee0155549a50 (patch) | |
| tree | 879daa5a1d430dadc74df56bbf1c97136381b59f /synapse/handlers/events.py | |
| parent | Delete the table objects from TransactionStore (diff) | |
| parent | bulk_get_push_rules should handle empty lists (diff) | |
| download | synapse-f4dad9f63995c8aa493ef884f793ee0155549a50.tar.xz | |
Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name
Conflicts: synapse/storage/push_rule.py
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 28c674730e..c73eec2b91 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -36,10 +36,6 @@ def stopped_user_eventstream(distributor, user): return distributor.fire("stopped_user_eventstream", user) -def user_joined_room(distributor, user, room_id): - return distributor.fire("user_joined_room", user, room_id) - - class EventStreamHandler(BaseHandler): def __init__(self, hs): @@ -136,9 +132,6 @@ class EventStreamHandler(BaseHandler): # thundering herds on restart. timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) - if is_guest: - yield user_joined_room(self.distributor, auth_user, room_id) - events, tokens = yield self.notifier.get_events_for( auth_user, pagin_config, timeout, only_room_events=only_room_events, |