diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
| commit | 336c546d6af5e85d830b6fe7cdc5445f92060b8a (patch) | |
| tree | 58a4794f7bcabf8c72013365d185f8099666d630 /synapse/storage/room.py | |
| parent | Merge branch 'cross-signing_hidden' into cross-signing_keys (diff) | |
| parent | don't need to return the hidden column any more (diff) | |
| download | synapse-336c546d6af5e85d830b6fe7cdc5445f92060b8a.tar.xz | |
Merge branch 'cross-signing_hidden' into cross-signing_keys
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index fe9d79d792..bc606292b8 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -193,14 +193,12 @@ class RoomWorkerStore(SQLBaseStore): ) if row: - defer.returnValue( - RatelimitOverride( - messages_per_second=row["messages_per_second"], - burst_count=row["burst_count"], - ) + return RatelimitOverride( + messages_per_second=row["messages_per_second"], + burst_count=row["burst_count"], ) else: - defer.returnValue(None) + return None class RoomStore(RoomWorkerStore, SearchStore): |