summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2023-01-10 16:31:28 +0000
committerGitHub <noreply@github.com>2023-01-10 16:31:28 +0000
commit06ab64f201dffcb93b826546e20be53cc712c8b8 (patch)
tree891699c8db995e9051ff4ce1b2c08517985246ea /synapse/config
parentUpdate changelog 2 (diff)
downloadsynapse-06ab64f201dffcb93b826546e20be53cc712c8b8.tar.xz
Implement MSC3925: changes to bundling of edits (#14811)
Two parts to this:

 * Bundle the whole of the replacement with any edited events. This is backwards-compatible so I haven't put it behind a flag.
 * Optionally, inhibit server-side replacement of edited events. This has scope to break things, so it is currently disabled by default.

Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/experimental.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index 0f3870bfe1..a8b2db372d 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -139,3 +139,6 @@ class ExperimentalConfig(Config):
 
         # MSC3391: Removing account data.
         self.msc3391_enabled = experimental.get("msc3391_enabled", False)
+
+        # MSC3925: do not replace events with their edits
+        self.msc3925_inhibit_edit = experimental.get("msc3925_inhibit_edit", False)