summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-14 13:39:33 +0100
committerErik Johnston <erik@matrix.org>2015-10-14 13:39:33 +0100
commitd7c70d09f0eca7cca7162c358be777d1ecfa2341 (patch)
tree382b0b98d2be2c1350df8dc333a3c72873a297c4 /synapse/handlers/federation.py
parentMerge pull request #303 from matrix-org/markjh/twisted_debugging (diff)
parentRemove unused room_id arg (diff)
downloadsynapse-d7c70d09f0eca7cca7162c358be777d1ecfa2341.tar.xz
Merge pull request #304 from matrix-org/erikj/remove_unused_arg
Remove unused room_id arg
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 3882ba79ed..a710bdcfdb 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -242,7 +242,7 @@ class FederationHandler(BaseHandler):
     @defer.inlineCallbacks
     def _filter_events_for_server(self, server_name, room_id, events):
         event_to_state = yield self.store.get_state_for_events(
-            room_id, frozenset(e.event_id for e in events),
+            frozenset(e.event_id for e in events),
             types=(
                 (EventTypes.RoomHistoryVisibility, ""),
                 (EventTypes.Member, None),