Merge branch 'kitsune-better-upgrade-ux'

2 files changed, 75 insertions, 2 deletions

diff --git a/lib/room.cpp b/lib/room.cpp
index fe50aa9a..60b9a684 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -387,11 +387,31 @@ QString Room::predecessorId() const
     return d->getCurrentState<RoomCreateEvent>()->predecessor().roomId;
 }
 
+Room* Room::predecessor(JoinStates statesFilter) const
+{
+    if (const auto& predId = predecessorId(); !predId.isEmpty())
+        if (auto* r = connection()->room(predId, statesFilter);
+                r && r->successorId() == id())
+            return r;
+
+    return nullptr;
+}
+
 QString Room::successorId() const
 {
     return d->getCurrentState<RoomTombstoneEvent>()->successorRoomId();
 }
 
+Room* Room::successor(JoinStates statesFilter) const
+{
+    if (const auto& succId = successorId(); !succId.isEmpty())
+        if (auto* r = connection()->room(succId, statesFilter);
+                r && r->predecessorId() == id())
+            return r;
+
+    return nullptr;
+}
+
 const Room::Timeline& Room::messageEvents() const { return d->timeline; }
 
 const Room::PendingEvents& Room::pendingEvents() const
@@ -928,12 +948,27 @@ void Room::removeTag(const QString& name)
                        << "not found, nothing to remove";
 }
 
-void Room::setTags(TagsMap newTags)
+void Room::setTags(TagsMap newTags, ActionScope applyOn)
 {
+    bool propagate = applyOn != ActionScope::ThisRoomOnly;
+    auto joinStates =
+        applyOn == ActionScope::WithinSameState ? joinState() :
+        applyOn == ActionScope::OmitLeftState ? JoinState::Join|JoinState::Invite :
+        JoinState::Join|JoinState::Invite|JoinState::Leave;
+    if (propagate) {
+        for (auto* r = this; (r = r->predecessor(joinStates));)
+            r->setTags(newTags, ActionScope::ThisRoomOnly);
+    }
+
     d->setTags(move(newTags));
     connection()->callApi<SetAccountDataPerRoomJob>(
         localUser()->id(), id(), TagEvent::matrixTypeId(),
         TagEvent(d->tags).contentJson());
+
+    if (propagate) {
+        for (auto* r = this; (r = r->successor(joinStates));)
+            r->setTags(newTags, ActionScope::ThisRoomOnly);
+    }
 }
 
 void Room::Private::setTags(TagsMap newTags)
diff --git a/lib/room.h b/lib/room.h
index 2c958033..ad19792e 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -27,6 +27,8 @@
 #include "events/accountdataevents.h"
 #include "events/encryptedevent.h"
 #include "events/roommessageevent.h"
+#include "events/roomcreateevent.h"
+#include "events/roomtombstoneevent.h"
 
 #include <QtCore/QJsonObject>
 #include <QtGui/QImage>
@@ -167,7 +169,22 @@ public:
     QString version() const;
     bool isUnstable() const;
     QString predecessorId() const;
+    /// Room predecessor
+    /** This function validates that the predecessor has a tombstone and
+     * the tombstone refers to the current room. If that's not the case,
+     * or if the predecessor is in a join state not matching \p stateFilter,
+     * the function returns nullptr.
+     */
+    Room* predecessor(JoinStates statesFilter = JoinState::Invite
+                                                | JoinState::Join) const;
     QString successorId() const;
+    /// Room successor
+    /** This function validates that the successor room's creation event
+     * refers to the current room. If that's not the case, or if the successor
+     * is in a join state not matching \p stateFilter, it returns nullptr.
+     */
+    Room* successor(JoinStates statesFilter = JoinState::Invite
+                                              | JoinState::Join) const;
     QString name() const;
     /// Room aliases defined on the current user's server
     /// \sa remoteAliases, setLocalAliases
@@ -288,6 +305,11 @@ public:
     const RelatedEvents relatedEvents(const RoomEvent& evt,
                                       const char* relType) const;
 
+    const RoomCreateEvent* creation() const
+    { return getCurrentState<RoomCreateEvent>(); }
+    const RoomTombstoneEvent* tombstone() const
+    { return getCurrentState<RoomTombstoneEvent>(); }
+
     bool displayed() const;
     /// Mark the room as currently displayed to the user
     /**
@@ -374,6 +396,19 @@ public:
     /// Remove a tag from the room
     Q_INVOKABLE void removeTag(const QString& name);
 
+    /// The scope to apply an action on
+    /*! This enumeration is used to pick a strategy to propagate certain
+     * actions on the room to its predecessors and successors.
+     */
+    enum ActionScope {
+        ThisRoomOnly,    //< Do not apply to predecessors and successors
+        WithinSameState, //< Apply to predecessors and successors in the same
+                         //< state as the current one
+        OmitLeftState,   //< Apply to all reachable predecessors and successors
+                         //< except those in Leave state
+        WholeSequence    //< Apply to all reachable predecessors and successors
+    };
+
     /** Overwrite the room's tags
      * This completely replaces the existing room's tags with a set
      * of new ones and updates the new set on the server. Unlike
@@ -381,8 +416,11 @@ public:
      * immediately, not waiting for confirmation from the server
      * (because tags are saved in account data rather than in shared
      * room state).
+     * \param applyOn setting this to Room::OnAllConversations will set tags
+     *                on this and all _known_ predecessors and successors;
+     *                by default only the current room is changed
      */
-    void setTags(TagsMap newTags);
+    void setTags(TagsMap newTags, ActionScope applyOn = ThisRoomOnly);
 
     /// Check whether the list of tags has m.favourite
     bool isFavourite() const;