OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Add origin_server_ts and sender fields to m.replace (#5613) 

Riot team would like some extra fields as part of m.replace, so here you go.

Fixes: #5598
pull/5641/head
Andrew Morgan 2019-07-05 17:20:02 +01:00 committed by GitHub
parent 80cc82a445
commit ad8b909ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5613.feature Normal file
View File

@ -0,0 +1 @@
Add `sender` and `origin_server_ts` fields to `m.replace`.

6
synapse/events/utils.py
View File

@ -392,7 +392,11 @@ class EventClientSerializer(object):
serialized_event["content"].pop("m.relates_to", None) serialized_event["content"].pop("m.relates_to", None)
r = serialized_event["unsigned"].setdefault("m.relations", {}) r = serialized_event["unsigned"].setdefault("m.relations", {})
r[RelationTypes.REPLACE] = {"event_id": edit.event_id} r[RelationTypes.REPLACE] = {
"event_id": edit.event_id,
"origin_server_ts": edit.origin_server_ts,
"sender": edit.sender,
}
defer.returnValue(serialized_event) defer.returnValue(serialized_event)

24
tests/rest/client/v2_alpha/test_relations.py
View File

@ -466,9 +466,15 @@ class RelationsTestCase(unittest.HomeserverTestCase):
self.assertEquals(channel.json_body["content"], new_body) self.assertEquals(channel.json_body["content"], new_body)
self.assertEquals( relations_dict = channel.json_body["unsigned"].get("m.relations")
channel.json_body["unsigned"].get("m.relations"), self.assertIn(RelationTypes.REPLACE, relations_dict)
{RelationTypes.REPLACE: {"event_id": edit_event_id}},
m_replace_dict = relations_dict[RelationTypes.REPLACE]
for key in ["event_id", "sender", "origin_server_ts"]:
self.assertIn(key, m_replace_dict)
self.assert_dict(
{"event_id": edit_event_id, "sender": self.user_id}, m_replace_dict
) )
def test_multi_edit(self): def test_multi_edit(self):
@ -518,9 +524,15 @@ class RelationsTestCase(unittest.HomeserverTestCase):
self.assertEquals(channel.json_body["content"], new_body) self.assertEquals(channel.json_body["content"], new_body)
self.assertEquals( relations_dict = channel.json_body["unsigned"].get("m.relations")
channel.json_body["unsigned"].get("m.relations"), self.assertIn(RelationTypes.REPLACE, relations_dict)
{RelationTypes.REPLACE: {"event_id": edit_event_id}},
m_replace_dict = relations_dict[RelationTypes.REPLACE]
for key in ["event_id", "sender", "origin_server_ts"]:
self.assertIn(key, m_replace_dict)
self.assert_dict(
{"event_id": edit_event_id, "sender": self.user_id}, m_replace_dict
) )
def _send_relation( def _send_relation(