summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-08 15:50:06 +0000
committerGitHub <noreply@github.com>2020-01-08 15:50:06 +0000
commit7c232bd98b369ad297c4c19dd9c9c8a9d5aa3e72 (patch)
tree18d066739e6e6432d993cfde74631c18a5d8bbea /synapse/app
parentMerge pull request #6665 from matrix-org/babolivier/retention_doc_typo (diff)
parentShuffle the code (diff)
downloadsynapse-7c232bd98b369ad297c4c19dd9c9c8a9d5aa3e72.tar.xz
Merge pull request #6664 from matrix-org/erikj/media_admin_apis
Fix media repo admin APIs when using a media worker.
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/media_repository.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py
index a63c53dc44..5b5832214a 100644
--- a/synapse/app/media_repository.py
+++ b/synapse/app/media_repository.py
@@ -34,6 +34,7 @@ from synapse.replication.slave.storage._base import BaseSlavedStore
 from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore
 from synapse.replication.slave.storage.client_ips import SlavedClientIpStore
 from synapse.replication.slave.storage.registration import SlavedRegistrationStore
+from synapse.replication.slave.storage.room import RoomStore
 from synapse.replication.slave.storage.transactions import SlavedTransactionStore
 from synapse.replication.tcp.client import ReplicationClientHandler
 from synapse.rest.admin import register_servlets_for_media_repo
@@ -47,6 +48,7 @@ logger = logging.getLogger("synapse.app.media_repository")
 
 
 class MediaRepositorySlavedStore(
+    RoomStore,
     SlavedApplicationServiceStore,
     SlavedRegistrationStore,
     SlavedClientIpStore,