From 2fb03272a8bc7da4943347ea7ecca6070f667bd6 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 26 Oct 2017 19:40:59 +0300
Subject: Move out common message event content classes

ImageContent is usable outside of m.room.message (in particular, m.room.avatar
uses the same structure for content. And EventContent::Base is very suitable to
derive from even for standard event content structures (such as in room name
events), let alone non-standard ones.
Also, renamed MessageEventContent to EventContent (for obvious reasons).
---
 events/roommessageevent.cpp | 48 +--------------------------------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

(limited to 'events/roommessageevent.cpp')

diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp
index 3fb0226a..82bd07b6 100644
--- a/events/roommessageevent.cpp
+++ b/events/roommessageevent.cpp
@@ -23,7 +23,7 @@
 #include <QtCore/QMimeDatabase>
 
 using namespace QMatrixClient;
-using namespace MessageEventContent;
+using namespace EventContent;
 
 using MsgType = RoomMessageEvent::MsgType;
 
@@ -124,20 +124,6 @@ QJsonObject RoomMessageEvent::toJson() const
     return obj;
 }
 
-QJsonObject Base::toJson() const
-{
-    QJsonObject o;
-    fillJson(&o);
-    return o;
-}
-
-QJsonObject InfoBase::toInfoJson() const
-{
-    QJsonObject info;
-    fillInfoJson(&info);
-    return info;
-}
-
 TextContent::TextContent(const QString& text, const QString& contentType)
     : Base(QMimeDatabase().mimeTypeForName(contentType)), body(text)
 { }
@@ -167,38 +153,6 @@ void TextContent::fillJson(QJsonObject* json) const
     json->insert("formatted_body", body);
 }
 
-FileInfo::FileInfo(const QUrl& u, int payloadSize, const QMimeType& mimeType,
-                 const QString& originalFilename)
-    : InfoBase(mimeType), url(u), payloadSize(payloadSize)
-    , originalName(originalFilename)
-{ }
-
-FileInfo::FileInfo(const QUrl& u, const QJsonObject& infoJson,
-                 const QString& originalFilename)
-    : FileInfo(u, infoJson["size"].toInt(),
-              QMimeDatabase().mimeTypeForName(infoJson["mimetype"].toString()),
-              originalFilename)
-{
-    if (!mimeType.isValid())
-        mimeType = QMimeDatabase().mimeTypeForData(QByteArray());
-}
-
-void FileInfo::fillInfoJson(QJsonObject* infoJson) const
-{
-    Q_ASSERT(infoJson);
-    infoJson->insert("size", payloadSize);
-    infoJson->insert("mimetype", mimeType.name());
-}
-
-void FileInfo::fillJson(QJsonObject* json) const
-{
-    Q_ASSERT(json);
-    json->insert("url", url.toString());
-    if (!originalName.isEmpty())
-        json->insert("filename", originalName);
-    json->insert("info", toInfoJson());
-}
-
 LocationContent::LocationContent(const QString& geoUri,
                                  const ImageInfo<>& thumbnail)
     : Thumbnailed<>(thumbnail), geoUri(geoUri)
-- 
cgit v1.2.3


From da8bb556dca628e20be732b4a30895010abcc9bf Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 31 Oct 2017 13:12:33 +0300
Subject: Streamline EventContent hierarchy

Two changes to make EventContent hierarchy easier to understand and use:
- InfoBase is unbound from Base, and downstream classes use multiple inheritance
to work "info" objects
- MIME types are separated from Base into a separate TypedBase class because
MIME typing is not common to all content kinds.
---
 events/roommessageevent.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'events/roommessageevent.cpp')

diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp
index 82bd07b6..f06474e9 100644
--- a/events/roommessageevent.cpp
+++ b/events/roommessageevent.cpp
@@ -28,7 +28,7 @@ using namespace EventContent;
 using MsgType = RoomMessageEvent::MsgType;
 
 template <typename ContentT>
-Base* make(const QJsonObject& json)
+TypedBase* make(const QJsonObject& json)
 {
     return new ContentT(json);
 }
@@ -37,7 +37,7 @@ struct MsgTypeDesc
 {
     QString jsonType;
     MsgType enumType;
-    Base* (*maker)(const QJsonObject&);
+    TypedBase* (*maker)(const QJsonObject&);
 };
 
 const std::vector<MsgTypeDesc> msgTypes =
@@ -74,7 +74,7 @@ MsgType jsonToMsgType(const QString& jsonType)
 }
 
 RoomMessageEvent::RoomMessageEvent(const QString& plainBody,
-                                   MsgType msgType, Base* content)
+                                   MsgType msgType, TypedBase* content)
     : RoomMessageEvent(plainBody, msgTypeToJson(msgType), content)
 { }
 
@@ -112,7 +112,7 @@ RoomMessageEvent::MsgType RoomMessageEvent::msgtype() const
 
 QMimeType RoomMessageEvent::mimeType() const
 {
-    return _content ? _content->mimeType :
+    return _content ? _content->type() :
                       QMimeDatabase().mimeTypeForName("text/plain");
 }
 
@@ -125,7 +125,7 @@ QJsonObject RoomMessageEvent::toJson() const
 }
 
 TextContent::TextContent(const QString& text, const QString& contentType)
-    : Base(QMimeDatabase().mimeTypeForName(contentType)), body(text)
+    : mimeType(QMimeDatabase().mimeTypeForName(contentType)), body(text)
 { }
 
 TextContent::TextContent(const QJsonObject& json)
@@ -170,6 +170,11 @@ void LocationContent::fillJson(QJsonObject* o) const
     o->insert("info", Thumbnailed::toInfoJson());
 }
 
+QMimeType LocationContent::type() const
+{
+    return QMimeDatabase().mimeTypeForData(geoUri.toLatin1());
+}
+
 PlayableInfo::PlayableInfo(const QUrl& u, int fileSize,
                            const QMimeType& mimeType, int duration,
                            const QString& originalFilename)
-- 
cgit v1.2.3