Merge commit '8d0097bef' into anoa/dinsic_release_1_18_x

* commit '8d0097bef': Fix bug in per-room message retention policies. (#7850)
matrix-org · Aug 4, 2020 · dd65904 · dd65904
2 parents fd40a70 + 8d0097b
commit dd65904
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/7850.bugfix 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
@@ -939,7 +939,7 @@ def _background_insert_retention_txn(txn):
                     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,
Original file line number	Diff line number	Diff line change
		@@ -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.