Fix edits that have different keys in new_content and content

See matrix-org/matrix-spec-proposals#2676 (comment)
Nheko-Reborn · Jun 9, 2021 · ce42797 · ce42797
1 parent 2de35c1
commit ce42797
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/include/mtx/events_impl.hpp b/include/mtx/events_impl.hpp
@@ -34,12 +34,14 @@ template<class Content>
 from_json(const json &obj, Event<Content> &event)
 {
         if (obj.at("content").contains("m.new_content")) {
-                auto new_content = obj.at("content");
-                for (const auto &e : obj["content"]["m.new_content"].items()) {
-                        if (e.key() != "m.relates_to" &&
-                            e.key() != "im.nheko.relations.v1.relations")
-                                new_content[e.key()] = e.value();
-                }
+                auto new_content = obj.at("content").at("m.new_content");
+
+                if (obj.at("content").contains("m.relates_to"))
+                        new_content["m.relates_to"] = obj.at("content").at("m.relates_to");
+                if (obj.at("content").contains("im.nheko.relations.v1.relations"))
+                        new_content["im.nheko.relations.v1.relations"] =
+                          obj.at("content").at("im.nheko.relations.v1.relations");
+
                 event.content = new_content.get<Content>();
         } else {
                 event.content = obj.at("content").get<Content>();