mirrors/synapse
mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2025-03-09 17:36:59 +00:00
Code Activity

Merge pull request #480 from matrix-org/erikj/guest_event_tightloop

Browse source 
Dont fire user_joined_room when guest hits /events
This commit is contained in:
Erik Johnston 2016-01-13 11:00:50 +00:00
commit 72ba26679b
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
synapse/handlers/events.py
View file

@ -36,10 +36,6 @@ def stopped_user_eventstream(distributor, user):
return distributor.fire("stopped_user_eventstream", 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): class EventStreamHandler(BaseHandler):
def __init__(self, hs): def __init__(self, hs):
@ -136,9 +132,6 @@ class EventStreamHandler(BaseHandler):
# thundering herds on restart. # thundering herds on restart.
timeout = random.randint(int(timeout*0.9), int(timeout*1.1)) 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( events, tokens = yield self.notifier.get_events_for(
auth_user, pagin_config, timeout, auth_user, pagin_config, timeout,
only_room_events=only_room_events, only_room_events=only_room_events,