summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-05-20 14:31:19 +0100
committerErik Johnston <erik@matrix.org>2019-05-20 14:31:19 +0100
commit1dff859d6aed58561a2b5913e5c9b897bbd3599c (patch)
treebc5a1b853370da63a0d9e090e67a3433aec0c321 /synapse/storage
parentMerge pull request #5209 from matrix-org/erikj/reactions_base (diff)
downloadsynapse-1dff859d6aed58561a2b5913e5c9b897bbd3599c.tar.xz
Rename relation types to match MSC
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/relations.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/relations.py b/synapse/storage/relations.py
index 63e6185ee3..493abe405e 100644
--- a/synapse/storage/relations.py
+++ b/synapse/storage/relations.py
@@ -351,7 +351,7 @@ class RelationsWorkerStore(SQLBaseStore):
 
         def _get_applicable_edit_txn(txn):
             txn.execute(
-                sql, (event_id, RelationTypes.REPLACES,)
+                sql, (event_id, RelationTypes.REPLACE,)
             )
             row = txn.fetchone()
             if row:
@@ -384,8 +384,8 @@ class RelationsStore(RelationsWorkerStore):
         rel_type = relation.get("rel_type")
         if rel_type not in (
             RelationTypes.ANNOTATION,
-            RelationTypes.REFERENCES,
-            RelationTypes.REPLACES,
+            RelationTypes.REFERENCE,
+            RelationTypes.REPLACE,
         ):
             # Unknown relation type
             return
@@ -413,7 +413,7 @@ class RelationsStore(RelationsWorkerStore):
             self.get_aggregation_groups_for_event.invalidate_many, (parent_id,)
         )
 
-        if rel_type == RelationTypes.REPLACES:
+        if rel_type == RelationTypes.REPLACE:
             txn.call_after(self.get_applicable_edit.invalidate, (parent_id,))
 
     def _handle_redaction(self, txn, redacted_event_id):