From 62ad12b69b3b085a32c9522194b7b141d2346361 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 2 Sep 2018 15:15:19 +0900
Subject: Switch tag order from strings to floats, as The Spec preaches

The Spec wasn't entirely consistent on this until recently but floats actually are used in the wild, rather than strings.
---
 lib/room.cpp | 74 ++++++++++++++++++++++++------------------------------------
 1 file changed, 29 insertions(+), 45 deletions(-)

(limited to 'lib/room.cpp')

diff --git a/lib/room.cpp b/lib/room.cpp
index 07c39498..18b06b7d 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -233,14 +233,13 @@ class Room::Private
          */
         bool processRedaction(const RedactionEvent& redaction);
 
-        std::pair<TagsMap, QStringList> setTags(TagsMap newTags);
-        void broadcastTagUpdates(const TagsMap& additions,
-                                 const QStringList& removals)
+        void setTags(TagsMap newTags);
+        void sendTagUpdates()
         {
             connection->callApi<SetAccountDataPerRoomJob>(
                     connection->userId(), id, TagEvent::matrixTypeId(),
                         TagEvent(tags).contentJson());
-            emit q->tagsChanged(additions, removals);
+            emit q->tagsChanged();
         }
 
         QJsonObject toJson() const;
@@ -695,7 +694,7 @@ std::pair<bool, QString> validatedTag(QString name)
         return { false, name };
 
     qWarning(MAIN) << "The tag" << name
-        << "doesn't follow the CS API conventions, check your client code";
+                   << "doesn't follow the CS API conventions";
     name.prepend("u.");
     qWarning(MAIN) << "Using " << name << "instead";
 
@@ -709,8 +708,10 @@ void Room::addTag(const QString& name, const TagRecord& record)
             (checkRes.first && d->tags.contains(checkRes.second)))
         return;
 
+    emit tagsAboutToChange();
     d->tags.insert(checkRes.second, record);
-    d->broadcastTagUpdates({{ checkRes.second, record }}, {});
+    emit tagsChanged();
+    d->sendTagUpdates();
 }
 
 void Room::addTag(const QString& name, const QString& order)
@@ -720,43 +721,32 @@ void Room::addTag(const QString& name, const QString& order)
 
 void Room::removeTag(const QString& name)
 {
-    if (!d->tags.contains(name))
-        return;
-
-    d->tags.remove(name);
-    d->broadcastTagUpdates({}, {{ name }});
+    if (d->tags.contains(name))
+    {
+        emit tagsAboutToChange();
+        d->tags.remove(name);
+        emit tagsChanged();
+        d->sendTagUpdates();
+    } else if (!name.startsWith("u."))
+        removeTag("u." + name);
+    else
+        qWarning(MAIN) << "Tag" << name << "on room" << objectName()
+                       << "not found, nothing to remove";
 }
 
 void Room::setTags(TagsMap newTags)
 {
-    const auto& changes = d->setTags(move(newTags));
-    d->broadcastTagUpdates(changes.first, changes.second);
+    d->setTags(move(newTags));
+    d->sendTagUpdates();
 }
 
-std::pair<TagsMap, QStringList> Room::Private::setTags(TagsMap newTags)
+void Room::Private::setTags(TagsMap newTags)
 {
-    if (newTags == tags)
-        return {};
-
-    TagsMap additions;
-    const auto& tagNames = newTags.keys();
-    for (const auto& t: tagNames)
-    {
-        const auto& checkRes = validatedTag(t);
-        const auto& value = checkRes.first ?
-                newTags.insert(checkRes.second, newTags.take(t)).value() :
-                newTags.value(checkRes.second);
-        if (!tags.contains(checkRes.second))
-            additions.insert(checkRes.second, value);
-    }
-
-    QStringList removals;
-    for (const auto& tag: tags.keys())
-        if (!newTags.contains(tag))
-            removals.push_back(tag);
-
-    tags = newTags;
-    return { additions, removals };
+    emit q->tagsAboutToChange();
+    tags = move(newTags);
+    qCDebug(MAIN) << "Room" << id << "is tagged with:"
+                  << q->tagNames().join(", ");
+    emit q->tagsChanged();
 }
 
 bool Room::isFavourite() const
@@ -1843,15 +1833,8 @@ void Room::processEphemeralEvent(EventPtr&& event)
 void Room::processAccountDataEvent(EventPtr&& event)
 {
     if (auto* evt = eventCast<TagEvent>(event))
-    {
-        const auto& changes = d->setTags(evt->tags());
-        if (!(changes.first.empty() && changes.second.empty()))
-        {
-            qCDebug(MAIN) << "Room" << id() << "is tagged with:"
-                          << tagNames().join(", ");
-            emit tagsChanged(changes.first, changes.second);
-        }
-    }
+        d->setTags(evt->tags());
+
     if (auto* evt = eventCast<ReadMarkerEvent>(event))
     {
         auto readEventId = evt->event_id();
@@ -1869,6 +1852,7 @@ void Room::processAccountDataEvent(EventPtr&& event)
     // efficient; maaybe do it another day
     if (!currentData || currentData->contentJson() != event->contentJson())
     {
+        emit accountDataAboutToChange(event->matrixType());
         currentData = move(event);
         qCDebug(MAIN) << "Updated account data of type"
                       << currentData->matrixType();
-- 
cgit v1.2.3