summary refs log tree commit diff
path: root/synapse/storage/databases/main/events.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-10-14 12:00:52 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 16:50:07 +0100
commite8dcadaccd3c64c831df41901fd7785689dfefaf (patch)
tree02516069312a666e4b4848fc43c7e05655ae47bf /synapse/storage/databases/main/events.py
parentMerge pull request #67 from matrix-org/anoa/dinsic_release_1_21_x (diff)
downloadsynapse-e8dcadaccd3c64c831df41901fd7785689dfefaf.tar.xz
Make sure a retention policy is a state event (#8527)
* Make sure a retention policy is a state event

* Changelog
Diffstat (limited to 'synapse/storage/databases/main/events.py')
-rw-r--r--synapse/storage/databases/main/events.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py

index 18def01f50..f766e148a0 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py
@@ -1241,6 +1241,10 @@ class PersistEventsStore: ) def _store_retention_policy_for_room_txn(self, txn, event): + if not event.is_state(): + logger.debug("Ignoring non-state m.room.retention event") + return + if hasattr(event, "content") and ( "min_lifetime" in event.content or "max_lifetime" in event.content ):