Fix tags saving/restoring (finally)

Closes #134.

4 files changed, 71 insertions, 24 deletions

diff --git a/events/tagevent.cpp b/events/tagevent.cpp
index c6297003..886a10c6 100644
--- a/events/tagevent.cpp
+++ b/events/tagevent.cpp
@@ -24,6 +24,12 @@ TagRecord::TagRecord(const QJsonObject& json)
     : order(json.value("order").toString())
 { }
 
+TagEvent::TagEvent()
+    : Event(Type::Tag)
+{
+    // TODO: Support getting a list of tags and saving it
+}
+
 TagEvent::TagEvent(const QJsonObject& obj)
     : Event(Type::Tag, obj)
 {
@@ -44,6 +50,21 @@ QHash<QString, TagRecord> TagEvent::tags() const
     return result;
 }
 
+bool TagEvent::empty() const
+{
+    return tagsObject().empty();
+}
+
+bool TagEvent::contains(const QString& name) const
+{
+    return tagsObject().contains(name);
+}
+
+TagRecord TagEvent::recordForTag(const QString& name) const
+{
+    return TagRecord(tagsObject().value(name).toObject());
+}
+
 QJsonObject TagEvent::tagsObject() const
 {
     return contentJson().value("tags").toObject();
diff --git a/events/tagevent.h b/events/tagevent.h
index 44a7e49a..26fe8788 100644
--- a/events/tagevent.h
+++ b/events/tagevent.h
@@ -35,6 +35,7 @@ namespace QMatrixClient
     class TagEvent : public Event
     {
         public:
+            TagEvent();
             explicit TagEvent(const QJsonObject& obj);
 
             /** Get the list of tag names */
@@ -43,9 +44,31 @@ namespace QMatrixClient
             /** Get the list of tags along with information on each */
             QHash<QString, TagRecord> tags() const;
 
-            static constexpr const char * TypeId = "m.tag";
+            /** Check if the event lists no tags */
+            bool empty() const;
+
+            /** Check whether the tags list contains the specified name */
+            bool contains(const QString& name) const;
 
-        protected:
+            /** Get the record for the given tag name */
+            TagRecord recordForTag(const QString& name) const;
+
+            /** Get the whole tags content as a JSON object
+             * It's NOT recommended to use this method directly from client code.
+             * Use other convenience methods provided by the class.
+             */
             QJsonObject tagsObject() const;
+
+            static constexpr const char * TypeId = "m.tag";
     };
+
+    using TagEventPtr = event_ptr_tt<TagEvent>;
+
+    inline QJsonValue toJson(const TagEventPtr& tagEvent)
+    {
+        return QJsonObject {{ "type", "m.tag" },
+            // TODO: Replace tagsObject() with a genuine list of tags
+            // (or make the needed JSON upon TagEvent creation)
+            { "content", QJsonObject {{ "tags", tagEvent->tagsObject() }} }};
+    }
 }
diff --git a/room.cpp b/room.cpp
index 20b19e93..ae3360dc 100644
--- a/room.cpp
+++ b/room.cpp
@@ -95,8 +95,8 @@ class Room::Private
         QString firstDisplayedEventId;
         QString lastDisplayedEventId;
         QHash<const User*, QString> lastReadEventIds;
-        QHash<QString, TagRecord> tags;
-        QHash<QString, QJsonObject> accountData;
+        TagEventPtr tags = std::make_unique<TagEvent>();
+        QHash<QString, QVariantHash> accountData;
         QString prevBatch;
         QPointer<RoomMessagesJob> roomMessagesJob;
 
@@ -556,27 +556,27 @@ void Room::resetHighlightCount()
 
 QStringList Room::tagNames() const
 {
-    return d->tags.keys();
+    return d->tags->tagNames();
 }
 
-const QHash<QString, TagRecord>& Room::tags() const
+QHash<QString, TagRecord> Room::tags() const
 {
-    return d->tags;
+    return d->tags->tags();
 }
 
 TagRecord Room::tag(const QString& name) const
 {
-    return d->tags.value(name);
+    return d->tags->recordForTag(name);
 }
 
 bool Room::isFavourite() const
 {
-    return d->tags.contains(FavouriteTag);
+    return d->tags->contains(FavouriteTag);
 }
 
 bool Room::isLowPriority() const
 {
-    return d->tags.contains(LowPriorityTag);
+    return d->tags->contains(LowPriorityTag);
 }
 
 const RoomMessageEvent*
@@ -1469,11 +1469,13 @@ void Room::processAccountDataEvent(EventPtr event)
     switch (event->type())
     {
         case EventType::Tag:
-            d->tags = static_cast<TagEvent*>(event.get())->tags();
+            d->tags.reset(static_cast<TagEvent*>(event.release()));
+            qCDebug(MAIN) << "Room" << id() << "is tagged with: "
+                          << tagNames().join(", ");
             emit tagsChanged();
             break;
         default:
-            d->accountData[event->jsonType()] = event->contentJson();
+            d->accountData[event->jsonType()] = event->contentJson().toVariantHash();
     }
 }
 
@@ -1645,19 +1647,20 @@ QJsonObject Room::Private::toJson() const
         result.insert("ephemeral", ephemeralObj);
     }
 
+    QJsonArray accountDataEvents;
+    if (!tags->empty())
+        accountDataEvents.append(QMatrixClient::toJson(tags));
+
+    if (!accountData.empty())
     {
-        QJsonObject accountDataObj;
-        if (!tags.empty())
-        {
-            QJsonObject tagsObj;
-            for (auto it = tags.begin(); it != tags.end(); ++it)
-                tagsObj.insert(it.key(), { {"order", it->order} });
-            if (!tagsObj.empty())
-                accountDataObj.insert("m.tag", tagsObj);
-        }
-        if (!accountDataObj.empty())
-            result.insert("account_data", accountDataObj);
+        for (auto it = accountData.begin(); it != accountData.end(); ++it)
+            accountDataEvents.append(QJsonObject {
+                {"type", it.key()},
+                {"content", QJsonObject::fromVariantHash(it.value())}
+            });
     }
+    QJsonObject accountDataEventsObj;
+    result.insert("account_data", QJsonObject { {"events", accountDataEvents} });
 
     QJsonObject unreadNotificationsObj;
     if (highlightCount > 0)
diff --git a/room.h b/room.h
index 8e27a608..71d5c433 100644
--- a/room.h
+++ b/room.h
@@ -241,7 +241,7 @@ namespace QMatrixClient
             Q_INVOKABLE void resetHighlightCount();
 
             QStringList tagNames() const;
-            const QHash<QString, TagRecord>& tags() const;
+            QHash<QString, TagRecord> tags() const;
             TagRecord tag(const QString& name) const;
 
             /** Check whether the list of tags has m.favourite */