diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 28862a1d25..6b347b1749 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -125,5 +125,5 @@ class RelationTypes(object):
"""The types of relations known to this server.
"""
ANNOTATION = "m.annotation"
- REPLACES = "m.replaces"
- REFERENCES = "m.references"
+ REPLACE = "m.replace"
+ REFERENCE = "m.reference"
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index bf3c8f8dc1..27a2a9ef98 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -355,7 +355,7 @@ class EventClientSerializer(object):
event_id,
)
references = yield self.store.get_relations_for_event(
- event_id, RelationTypes.REFERENCES, direction="f",
+ event_id, RelationTypes.REFERENCE, direction="f",
)
if annotations.chunk:
@@ -364,7 +364,7 @@ class EventClientSerializer(object):
if references.chunk:
r = serialized_event["unsigned"].setdefault("m.relations", {})
- r[RelationTypes.REFERENCES] = references.to_dict()
+ r[RelationTypes.REFERENCE] = references.to_dict()
edit = None
if event.type == EventTypes.Message:
@@ -382,7 +382,7 @@ class EventClientSerializer(object):
serialized_event["content"].pop("m.relates_to", None)
r = serialized_event["unsigned"].setdefault("m.relations", {})
- r[RelationTypes.REPLACES] = {
+ r[RelationTypes.REPLACE] = {
"event_id": edit.event_id,
}
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):
|
