1 files changed, 34 insertions, 2 deletions

diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index 4c29a93e..c2e075eb 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -21,6 +21,8 @@
 #include "roomevent.h"
 #include "eventcontent.h"
 
+class QFileInfo;
+
 namespace QMatrixClient
 {
     namespace MessageEventContent = EventContent; // Back-compatibility
@@ -49,6 +51,9 @@ namespace QMatrixClient
             explicit RoomMessageEvent(const QString& plainBody,
                                       MsgType msgType = MsgType::Text,
                                       EventContent::TypedBase* content = nullptr);
+            explicit RoomMessageEvent(const QString& plainBody,
+                                      const QFileInfo& file,
+                                      bool asGenericFile = false);
             explicit RoomMessageEvent(const QJsonObject& obj);
 
             MsgType msgtype() const;
@@ -56,14 +61,27 @@ namespace QMatrixClient
             QString plainBody() const;
             EventContent::TypedBase* content() const
                                              { return _content.data(); }
+            template <typename VisitorT>
+            void editContent(VisitorT visitor)
+            {
+                visitor(*_content);
+                editJson()[ContentKeyL] =
+                    assembleContentJson(plainBody(), rawMsgtype(), content());
+            }
             QMimeType mimeType() const;
             bool hasTextContent() const;
             bool hasFileContent() const;
             bool hasThumbnail() const;
 
+            static QString rawMsgTypeForUrl(const QUrl& url);
+            static QString rawMsgTypeForFile(const QFileInfo& fi);
+
         private:
             QScopedPointer<EventContent::TypedBase> _content;
 
+            static QJsonObject assembleContentJson(const QString& plainBody,
+                const QString& jsonMsgType, EventContent::TypedBase* content);
+
             REGISTER_ENUM(MsgType)
     };
     REGISTER_EVENT_TYPE(RoomMessageEvent)
@@ -74,6 +92,17 @@ namespace QMatrixClient
     {
         // Additional event content types
 
+        struct RelatesTo
+        {
+            static constexpr const char* ReplyTypeId() { return "m.in_reply_to"; }
+            QString type; // The only supported relation so far
+            QString eventId;
+        };
+        inline RelatesTo replyTo(QString eventId)
+        {
+            return { RelatesTo::ReplyTypeId(), std::move(eventId) };
+        }
+
         /**
          * Rich text content for m.text, m.emote, m.notice
          *
@@ -83,13 +112,15 @@ namespace QMatrixClient
         class TextContent: public TypedBase
         {
             public:
-                TextContent(const QString& text, const QString& contentType);
+                TextContent(const QString& text, const QString& contentType,
+                            Omittable<RelatesTo> relatesTo = none);
                 explicit TextContent(const QJsonObject& json);
 
                 QMimeType type() const override { return mimeType; }
 
                 QMimeType mimeType;
                 QString body;
+                Omittable<RelatesTo> relatesTo;
 
             protected:
                 void fillJson(QJsonObject* json) const override;
@@ -112,7 +143,7 @@ namespace QMatrixClient
         {
             public:
                 LocationContent(const QString& geoUri,
-                                const ImageInfo& thumbnail);
+                                const Thumbnail& thumbnail = {});
                 explicit LocationContent(const QJsonObject& json);
 
                 QMimeType type() const override;
@@ -132,6 +163,7 @@ namespace QMatrixClient
         class PlayableContent : public ContentT
         {
             public:
+                using ContentT::ContentT;
                 PlayableContent(const QJsonObject& json)
                     : ContentT(json)
                     , duration(ContentT::originalInfoJson["duration"_ls].toInt())