summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 10:16:17 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 10:16:17 +0000
commita8c2c547ce40b9d95580138bfe7212876983d35d (patch)
tree4039a26e36482337fb69b76bd27dcefeeac71805
parentRemove double return statements (#5962) (diff)
parentEnsure an auth instance is available to ListMediaInRoom (#5967) (diff)
downloadsynapse-a8c2c547ce40b9d95580138bfe7212876983d35d.tar.xz
Ensure an auth instance is available to ListMediaInRoom (#5967)
-rw-r--r--changelog.d/5967.bugfix1
-rw-r--r--synapse/handlers/presence.py2
-rw-r--r--synapse/rest/admin/media.py1
3 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/5967.bugfix b/changelog.d/5967.bugfix
new file mode 100644

index 0000000000..8d7bf5c2e9 --- /dev/null +++ b/changelog.d/5967.bugfix
@@ -0,0 +1 @@ +Fix list media admin API always returning an error. diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 8377a0ddc2..053cf66b28 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py
@@ -255,7 +255,7 @@ class PresenceHandler(object): self.unpersisted_users_changes = set() if unpersisted: - logger.info("Persisting %d upersisted presence updates", len(unpersisted)) + logger.info("Persisting %d unpersisted presence updates", len(unpersisted)) yield self.store.update_presence( [self.user_to_current_state[user_id] for user_id in unpersisted] ) diff --git a/synapse/rest/admin/media.py b/synapse/rest/admin/media.py
index f3f63f0be7..ed7086d09c 100644 --- a/synapse/rest/admin/media.py +++ b/synapse/rest/admin/media.py
@@ -60,6 +60,7 @@ class ListMediaInRoom(RestServlet): def __init__(self, hs): self.store = hs.get_datastore() + self.auth = hs.get_auth() @defer.inlineCallbacks def on_GET(self, request, room_id):