diff options
| author | schmop <lars.richard@rocketmail.com> | 2022-11-24 11:49:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-24 10:49:04 +0000 |
| commit | c2e06c36d4ac2aef9de1a192cdcf9964415d09d2 (patch) | |
| tree | fe0649f325a31b3527ec606d2206b5a2de032a89 | |
| parent | Implement message forward pagination from start when no from is given, fixes ... (diff) | |
| download | synapse-c2e06c36d4ac2aef9de1a192cdcf9964415d09d2.tar.xz | |
Fix crash admin media list api when info is None (#14537)
Fixes https://github.com/matrix-org/synapse/issues/14536
| -rw-r--r-- | changelog.d/14537.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/room.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/14537.bugfix b/changelog.d/14537.bugfix new file mode 100644 index 0000000000..d7ce78d032 --- /dev/null +++ b/changelog.d/14537.bugfix @@ -0,0 +1 @@ +Fix a long-standing bug where the [List media admin API](https://matrix-org.github.io/synapse/latest/admin_api/media_admin_api.html#list-all-media-in-a-room) would fail when processing an image with broken thumbnail information. \ No newline at end of file diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index 4fbaefad73..52ad947c6c 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -912,7 +912,11 @@ class RoomWorkerStore(CacheInvalidationWorkerStore): event_json = db_to_json(content_json) content = event_json["content"] content_url = content.get("url") - thumbnail_url = content.get("info", {}).get("thumbnail_url") + info = content.get("info") + if isinstance(info, dict): + thumbnail_url = info.get("thumbnail_url") + else: + thumbnail_url = None for url in (content_url, thumbnail_url): if not url: |