summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:02:22 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:02:22 +0000
commitc049f60d4af29e497f537d4808203b3c3fd17f0e (patch)
tree1eb4d764172ec6dedde6bc840ff61f5f405db44a /synapse/handlers/_base.py
parentMerge branch 'invalid_user_name' into develop (diff)
parentRemove unused parameters (diff)
downloadsynapse-c049f60d4af29e497f537d4808203b3c3fd17f0e.tar.xz
Merge pull request #500 from matrix-org/daniel/cleanup
Remove unused parameters
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 66e35de6e4..bb2c6733d5 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -171,12 +171,10 @@ class BaseHandler(object):
         )
 
     @defer.inlineCallbacks
-    def handle_new_client_event(self, event, context, extra_destinations=[],
-                                extra_users=[], suppress_auth=False):
+    def handle_new_client_event(self, event, context, extra_users=[]):
         # We now need to go and hit out to wherever we need to hit out to.
 
-        if not suppress_auth:
-            self.auth.check(event, auth_events=context.current_state)
+        self.auth.check(event, auth_events=context.current_state)
 
         yield self.maybe_kick_guest_users(event, context.current_state.values())
 
@@ -258,7 +256,7 @@ class BaseHandler(object):
             event, self
         )
 
-        destinations = set(extra_destinations)
+        destinations = set()
         for k, s in context.current_state.items():
             try:
                 if k[0] == EventTypes.Member: