diff options
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | lib/events/roommessageevent.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 764d56d6..69a58ba0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,8 +35,6 @@ before_build: build_script: - cmake %CMAKE_ARGS% %CMAKE_E2EE_ARGS% -H. -Bbuild - cmake --build build -# qmake uses olm just built by CMake - it can't build olm on its own. -- qmake -Wall quotest.pro -- %QMAKE_E2EE_ARGS% && jom #after_build: #- cmake --build build --target install diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp index 4a733772..a9d9754f 100644 --- a/lib/events/roommessageevent.cpp +++ b/lib/events/roommessageevent.cpp @@ -325,7 +325,10 @@ void TextContent::fillJson(QJsonObject* json) const } if (relatesTo) { json->insert(QStringLiteral("m.relates_to"), - QJsonObject { { "rel_type", relatesTo->type }, { EventIdKey, relatesTo->eventId } }); + relatesTo->type == RelatesTo::ReplyTypeId() ? + QJsonObject { { relatesTo->type, QJsonObject{ { EventIdKey, relatesTo->eventId } } } } : + QJsonObject { { "rel_type", relatesTo->type }, { EventIdKey, relatesTo->eventId } } + ); if (relatesTo->type == RelatesTo::ReplacementTypeId()) { QJsonObject newContentJson; if (mimeType.inherits("text/html")) { |