From cc9de7f3b0d0459a773a82a79a6c38bbf4ea6ea7 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Fri, 8 Jan 2021 12:48:39 +0100 Subject: [PATCH] Fix some nulls in relations --- src/Olm.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Olm.cpp b/src/Olm.cpp index 07fc49f6..fe789560 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -579,13 +579,12 @@ encrypt_group_message(const std::string &room_id, const std::string &device_id, mtx::common::RelatesTo r_relation; // relations shouldn't be encrypted... - if (body["content"].contains("m.relates_to") && - body["content"]["m.relates_to"].contains("m.in_reply_to")) { - relation = body["content"]["m.relates_to"]; - body["content"].erase("m.relates_to"); - } else if (body["content"]["m.relates_to"].contains("event_id")) { - r_relation = body["content"]["m.relates_to"]; - body["content"].erase("m.relates_to"); + if (body["content"].contains("m.relates_to")) { + if (body["content"]["m.relates_to"].contains("m.in_reply_to")) { + relation = body["content"]["m.relates_to"]; + } else if (body["content"]["m.relates_to"].contains("event_id")) { + r_relation = body["content"]["m.relates_to"]; + } } auto payload = olm::client()->encrypt_group_message(session.get(), body.dump());