diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-06-07 15:27:12 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-06-07 15:27:12 +0100 |
commit | c54fcd9ee430d41a6af6ad63af1e663d093e625f (patch) | |
tree | 06d35c46e23aae8e66fce453a5506212b2b8991c /synapse/handlers/federation.py | |
parent | Merge pull request #847 from matrix-org/erikj/gc_tick (diff) | |
parent | Remove dead code. (diff) | |
download | synapse-c54fcd9ee430d41a6af6ad63af1e663d093e625f.tar.xz |
Merge pull request #848 from matrix-org/markjh/unusedIV
Remove dead code.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 648a505e65..ff83c608e7 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -66,10 +66,6 @@ class FederationHandler(BaseHandler): self.hs = hs - self.distributor.observe("user_joined_room", self.user_joined_room) - - self.waiting_for_join_list = {} - self.store = hs.get_datastore() self.replication_layer = hs.get_replication_layer() self.state_handler = hs.get_state_handler() @@ -1091,15 +1087,6 @@ class FederationHandler(BaseHandler): def get_min_depth_for_context(self, context): return self.store.get_min_depth(context) - @log_function - def user_joined_room(self, user, room_id): - waiters = self.waiting_for_join_list.get( - (user.to_string(), room_id), - [] - ) - while waiters: - waiters.pop().callback(None) - @defer.inlineCallbacks @log_function def _handle_new_event(self, origin, event, state=None, auth_events=None, |