From d1663570003b20be58d4ce87e4b1d26bdf0029a8 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 25 Jan 2018 12:26:19 +0900
Subject: Room::toJson: fix invite state caching

Causes a cache version upgrade; the old cache stores the state in an
incorrect place that won't be supported. Closes #159.
---
 connection.cpp | 2 +-
 room.cpp       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/connection.cpp b/connection.cpp
index f498f613..efe47f86 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -551,7 +551,7 @@ void Connection::setHomeserver(const QUrl& url)
     emit homeserverChanged(homeserver());
 }
 
-static constexpr int CACHE_VERSION_MAJOR = 1;
+static constexpr int CACHE_VERSION_MAJOR = 2;
 static constexpr int CACHE_VERSION_MINOR = 0;
 
 void Connection::saveState(const QUrl &toFile) const
diff --git a/room.cpp b/room.cpp
index e3e0fb47..71b7b228 100644
--- a/room.cpp
+++ b/room.cpp
@@ -1467,7 +1467,9 @@ QJsonObject Room::Private::toJson() const
         QJsonObject roomStateObj;
         roomStateObj.insert("events", stateEvents);
 
-        result.insert("state", roomStateObj);
+        result.insert(
+            joinState == JoinState::Invite ? "invite_state" : "state",
+            roomStateObj);
     }
 
     if (!q->readMarkerEventId().isEmpty())
-- 
cgit v1.2.3