summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-10 10:31:00 +0000
committerErik Johnston <erik@matrix.org>2014-11-10 10:31:00 +0000
commit6cb6cb9e6908ad9b71ebd63ca535eb6c7c48be86 (patch)
tree86d9ddda58154b921d274d65015a29c3ab6c0798 /synapse/storage/room.py
parentFinish redaction algorithm. (diff)
downloadsynapse-6cb6cb9e6908ad9b71ebd63ca535eb6c7c48be86.tar.xz
Tidy up some of the unused sql tables
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py27
1 files changed, 0 insertions, 27 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 0c83c11ad3..ca70506d28 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -132,22 +132,6 @@ class RoomStore(SQLBaseStore):
 
         defer.returnValue(ret)
 
-    @defer.inlineCallbacks
-    def get_room_join_rule(self, room_id):
-        sql = (
-            "SELECT join_rule FROM room_join_rules as r "
-            "INNER JOIN current_state_events as c "
-            "ON r.event_id = c.event_id "
-            "WHERE c.room_id = ? "
-        )
-
-        rows = yield self._execute(None, sql, room_id)
-
-        if len(rows) == 1:
-            defer.returnValue(rows[0][0])
-        else:
-            defer.returnValue(None)
-
     def _store_room_topic_txn(self, txn, event):
         self._simple_insert_txn(
             txn,
@@ -170,17 +154,6 @@ class RoomStore(SQLBaseStore):
             }
         )
 
-    def _store_join_rule(self, txn, event):
-        self._simple_insert_txn(
-            txn,
-            "room_join_rules",
-            {
-                "event_id": event.event_id,
-                "room_id": event.room_id,
-                "join_rule": event.content["join_rule"],
-            },
-        )
-
 
 class RoomsTable(Table):
     table_name = "rooms"