summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-19 17:10:26 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-29 17:06:57 +0000
commitd413a2ba981b3e8d443d2ccdd0c8de7d43b62e73 (patch)
tree32ad4d992e36ddd7d76a86afe2ceffd4e5368e6b /synapse
parentMerge pull request #2831 from matrix-org/rav/fix-userdir-search-again (diff)
downloadsynapse-d413a2ba981b3e8d443d2ccdd0c8de7d43b62e73.tar.xz
Remove unused "event_type" param on state.get_current_state_ids
this param doesn't seem to be used, and is a bit pointless anyway because it
can easily be replicated by the caller. It is also horrible, because it changes
the return type of the method.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/state.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 1f9abf9d3d..18f1edef42 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -146,8 +146,7 @@ class StateHandler(object):
         defer.returnValue(state)
 
     @defer.inlineCallbacks
-    def get_current_state_ids(self, room_id, event_type=None, state_key="",
-                              latest_event_ids=None):
+    def get_current_state_ids(self, room_id, latest_event_ids=None):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
@@ -155,10 +154,6 @@ class StateHandler(object):
         ret = yield self.resolve_state_groups(room_id, latest_event_ids)
         state = ret.state
 
-        if event_type:
-            defer.returnValue(state.get((event_type, state_key)))
-            return
-
         defer.returnValue(state)
 
     @defer.inlineCallbacks