summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-02 11:33:03 +0100
committerErik Johnston <erik@matrix.org>2019-09-02 11:33:03 +0100
commit02f759e0a213ab8e3d03895bcae3a173ef913bce (patch)
tree20d8067f2e1b5d19b4232fdb2d97322e27c92ad1 /synapse
parentMerge branch 'rei/rss_target' of github.com:matrix-org/synapse into rei/rss_inc8 (diff)
downloadsynapse-02f759e0a213ab8e3d03895bcae3a173ef913bce.tar.xz
Renamve get_room_state
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/stats.py4
-rw-r--r--synapse/storage/stats.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py
index 67b7c3f513..e849c38b85 100644
--- a/synapse/handlers/stats.py
+++ b/synapse/handlers/stats.py
@@ -258,7 +258,7 @@ class StatsHandler(StateDeltasHandler):
                 is_newly_created = True
 
             elif typ == EventTypes.JoinRules:
-                old_room_state = yield self.store.get_room_state(room_id)
+                old_room_state = yield self.store.get_room_stats_state(room_id)
                 yield self.store.update_room_state(
                     room_id, {"join_rules": event_content.get("join_rule")}
                 )
@@ -279,7 +279,7 @@ class StatsHandler(StateDeltasHandler):
                         )
 
             elif typ == EventTypes.RoomHistoryVisibility:
-                old_room_state = yield self.store.get_room_state(room_id)
+                old_room_state = yield self.store.get_room_stats_state(room_id)
                 yield self.store.update_room_state(
                     room_id,
                     {"history_visibility": event_content.get("history_visibility")},
diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index c3a8d6f5e7..f20d8ba8a4 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -709,9 +709,9 @@ class StatsStore(StateDeltasStore):
 
         return slice_list
 
-    def get_room_state(self, room_id):
+    def get_room_stats_state(self, room_id):
         """
-        Returns the current room_state for a room.
+        Returns the current room_stats_state for a room.
 
         Args:
             room_id (str): The ID of the room to return state for.