summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-07-14 15:51:13 -0400
committerGitHub <noreply@github.com>2020-07-14 15:51:13 -0400
commit8d0097bef112c848d37b1d2f601eb979e89245f6 (patch)
tree8f19e31d760a6d3ff6bee9e8cf20eec355b8fc43
parentAllow email subjects to be customised through Synapse's configuration (#7846) (diff)
downloadsynapse-8d0097bef112c848d37b1d2f601eb979e89245f6.tar.xz
Fix bug in per-room message retention policies. (#7850)
-rw-r--r--changelog.d/7850.bugfix1
-rw-r--r--synapse/storage/data_stores/main/room.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7850.bugfix b/changelog.d/7850.bugfix
new file mode 100644
index 0000000000..5f19a89043
--- /dev/null
+++ b/changelog.d/7850.bugfix
@@ -0,0 +1 @@
+Fix "AttributeError: 'str' object has no attribute 'get'" error message when applying per-room message retention policies. The bug was introduced in Synapse 1.7.0.
diff --git a/synapse/storage/data_stores/main/room.py b/synapse/storage/data_stores/main/room.py
index dace20e6db..b4817d693f 100644
--- a/synapse/storage/data_stores/main/room.py
+++ b/synapse/storage/data_stores/main/room.py
@@ -916,7 +916,7 @@ class RoomBackgroundUpdateStore(SQLBaseStore):
                     retention_policy = {}
                 else:
                     ev = json.loads(row["json"])
-                    retention_policy = json.dumps(ev["content"])
+                    retention_policy = ev["content"]
 
                 self.db.simple_insert_txn(
                     txn=txn,