diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-13 11:00:50 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-13 11:00:50 +0000 |
| commit | 72ba26679ba03a5ab49c0a9323abc0c5e4b0d46b (patch) | |
| tree | 227c23d7a9b4b59c13af31d300d88c544aa692a0 | |
| parent | Merge pull request #481 from matrix-org/erikj/SYN-589 (diff) | |
| parent | Dont fire user_joined_room when guest hits /events (diff) | |
| download | synapse-72ba26679ba03a5ab49c0a9323abc0c5e4b0d46b.tar.xz | |
Merge pull request #480 from matrix-org/erikj/guest_event_tightloop
Dont fire user_joined_room when guest hits /events
| -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, |