diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-24 15:27:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-24 15:27:59 +0100 |
| commit | 70899d3ab29cd57301fb135130c940f312bfe482 (patch) | |
| tree | 69383590001210f59f429ffb88c6afda4c26d789 /synapse/storage/room.py | |
| parent | Make deleting deletes not undelete (diff) | |
| download | synapse-70899d3ab29cd57301fb135130c940f312bfe482.tar.xz | |
Rename deletions to redactions
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index b1239a0f1a..8cd46334cf 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -27,7 +27,7 @@ import logging logger = logging.getLogger(__name__) -OpsLevel = collections.namedtuple("OpsLevel", ("ban_level", "kick_level", "delete_level")) +OpsLevel = collections.namedtuple("OpsLevel", ("ban_level", "kick_level", "redact_level")) class RoomStore(SQLBaseStore): @@ -189,7 +189,7 @@ class RoomStore(SQLBaseStore): def _get_ops_levels(self, txn, room_id): sql = ( - "SELECT ban_level, kick_level, delete_level " + "SELECT ban_level, kick_level, redact_level " "FROM room_ops_levels as r " "INNER JOIN current_state_events as c " "ON r.event_id = c.event_id " @@ -327,8 +327,8 @@ class RoomStore(SQLBaseStore): if "ban_level" in event.content: content["ban_level"] = event.content["ban_level"] - if "delete_level" in event.content: - content["delete_level"] = event.content["delete_level"] + if "redact_level" in event.content: + content["redact_level"] = event.content["redact_level"] self._simple_insert_txn( txn, |