MSC1849 compatible edited messages (#373)

* Make handling of edited messages MSC1849 compatible

Server side aggregation replaces `content` with `new_content` in
edited messages. The same must be done at client side on
incremental updates to keep timeline consistent.

As server side aggregations is in use by default from Synapse 1.2.0
this patch fixes a real issue.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/room.cpp b/lib/room.cpp
index 5a966ceb..2945111a 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -2127,7 +2127,7 @@ RoomEventPtr makeReplaced(const RoomEvent& target,
                           const RoomMessageEvent& replacement)
 {
     auto originalJson = target.originalJsonObject();
-    originalJson[ContentKeyL] = replacement.contentJson();
+    originalJson[ContentKeyL] = replacement.contentJson().value("m.new_content"_ls);
 
     auto unsignedData = originalJson.take(UnsignedKeyL).toObject();
     auto relations = unsignedData.take("m.relations"_ls).toObject();