diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-01 18:24:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-01 18:24:56 +0100 |
| commit | b8ab9f1c0a93c2c52f2990c42e5cb27167281694 (patch) | |
| tree | 039e8304e5b5994f2d94579ce7ef7a60cdad5e9c /synapse/storage | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into room_config (diff) | |
| download | synapse-b8ab9f1c0a93c2c52f2990c42e5cb27167281694.tar.xz | |
Add all the necessary checks to make banning work.
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/room.py | 3 | ||||
| -rw-r--r-- | synapse/storage/schema/im.sql | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 3b2d1a8ecd..3ca07f4350 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -165,8 +165,7 @@ class RoomStore(SQLBaseStore): rows = txn.execute(sql, (room_id, user_id,)).fetchall() if len(rows) == 1: - defer.returnValue(rows[0][0]) - return + return rows[0][0] sql = ( "SELECT level FROM room_default_levels as r " diff --git a/synapse/storage/schema/im.sql b/synapse/storage/schema/im.sql index 1de0d59066..dbefbbda31 100644 --- a/synapse/storage/schema/im.sql +++ b/synapse/storage/schema/im.sql @@ -150,7 +150,7 @@ CREATE TABLE IF NOT EXISTS room_ops_levels( event_id TEXT NOT NULL, room_id TEXT NOT NULL, ban_level INTEGER, - kick_level INTEGER, + kick_level INTEGER ); CREATE INDEX IF NOT EXISTS room_ops_levels_event_id ON room_ops_levels(event_id); |