Merge branch 'kitsune-better-upgrade-ux'

1 files changed, 36 insertions, 1 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)