diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-11 14:14:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-11 14:14:30 +0000 |
| commit | adb3a873fdb2b9eb6b41a95c193d97ae0983a72b (patch) | |
| tree | 7d02b56988a02fc3f961d9367081ffbd6c1284cd /synapse/storage/data_stores | |
| parent | Prevent redacted events from appearing in message search (#6377) (diff) | |
| parent | 1.7.0rc2 (diff) | |
| download | synapse-adb3a873fdb2b9eb6b41a95c193d97ae0983a72b.tar.xz | |
Merge tag 'v1.7.0rc2' into develop
Synapse 1.7.0rc2 (2019-12-11) ============================= Bugfixes -------- - Fix incorrect error message for invalid requests when setting user's avatar URL. ([\#6497](https://github.com/matrix-org/synapse/issues/6497)) - Fix support for SQLite 3.7. ([\#6499](https://github.com/matrix-org/synapse/issues/6499)) - Fix regression where sending email push would not work when using a pusher worker. ([\#6507](https://github.com/matrix-org/synapse/issues/6507), [\#6509](https://github.com/matrix-org/synapse/issues/6509))
Diffstat (limited to 'synapse/storage/data_stores')
| -rw-r--r-- | synapse/storage/data_stores/main/room.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/storage/data_stores/main/room.py b/synapse/storage/data_stores/main/room.py index 0148be20d3..aa476d0fbf 100644 --- a/synapse/storage/data_stores/main/room.py +++ b/synapse/storage/data_stores/main/room.py @@ -46,6 +46,11 @@ RatelimitOverride = collections.namedtuple( class RoomWorkerStore(SQLBaseStore): + def __init__(self, database: Database, db_conn, hs): + super(RoomWorkerStore, self).__init__(database, db_conn, hs) + + self.config = hs.config + def get_room(self, room_id): """Retrieve a room. |