From f12e09ea1b45be1a96533aa83f6227940c70d548 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 16 Nov 2017 14:03:55 +0900
Subject: Require state_key to be present in all state events

This impacts the cache as well, as we don't save state_keys for most
state events.
---
 connection.cpp |  2 +-
 events/event.h |  3 ++-
 room.cpp       | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/connection.cpp b/connection.cpp
index d15067dd..37d216d7 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -402,7 +402,7 @@ QByteArray Connection::generateTxnId()
     return d->data->generateTxnId();
 }
 
-static constexpr int CACHE_VERSION_MAJOR = 0;
+static constexpr int CACHE_VERSION_MAJOR = 1;
 static constexpr int CACHE_VERSION_MINOR = 0;
 
 void Connection::saveState(const QUrl &toFile) const
diff --git a/events/event.h b/events/event.h
index 9c915e35..c0c1b603 100644
--- a/events/event.h
+++ b/events/event.h
@@ -159,7 +159,8 @@ namespace QMatrixClient
             template <typename... ContentParamTs>
             explicit StateEvent(Type type, const QJsonObject& obj,
                                 ContentParamTs&&... contentParams)
-                : RoomEvent(type, obj)
+                : RoomEvent(obj.contains("state_key") ? type : Type::Unknown,
+                            obj)
                 , _content(contentJson(),
                            std::forward<ContentParamTs>(contentParams)...)
             {
diff --git a/room.cpp b/room.cpp
index c4e4c6cd..c5c4e721 100644
--- a/room.cpp
+++ b/room.cpp
@@ -973,7 +973,7 @@ void Room::Private::updateDisplayname()
 }
 
 template <typename T>
-void appendEventJson(QJsonArray& events, const QString& type,
+void appendStateEvent(QJsonArray& events, const QString& type,
                      const QString& name, const T& content)
 {
     if (content.isEmpty())
@@ -985,6 +985,7 @@ void appendEventJson(QJsonArray& events, const QString& type,
     QJsonObject eventObj;
     eventObj.insert("type", type);
     eventObj.insert("content", contentObj);
+    eventObj.insert("state_key", ""); // Mandatory for state events
 
     events.append(eventObj);
 }
@@ -995,14 +996,14 @@ QJsonObject Room::Private::toJson() const
     {
         QJsonArray stateEvents;
 
-        appendEventJson(stateEvents, "m.room.name", "name", name);
-        appendEventJson(stateEvents, "m.room.topic", "topic", topic);
-        appendEventJson(stateEvents, "m.room.avatar", "url",
-                        avatar.url().toString());
-        appendEventJson(stateEvents, "m.room.aliases", "aliases",
-                        QJsonArray::fromStringList(aliases));
-        appendEventJson(stateEvents, "m.room.canonical_alias", "alias",
-                        canonicalAlias);
+        appendStateEvent(stateEvents, "m.room.name", "name", name);
+        appendStateEvent(stateEvents, "m.room.topic", "topic", topic);
+        appendStateEvent(stateEvents, "m.room.avatar", "url",
+                         avatar.url().toString());
+        appendStateEvent(stateEvents, "m.room.aliases", "aliases",
+                         QJsonArray::fromStringList(aliases));
+        appendStateEvent(stateEvents, "m.room.canonical_alias", "alias",
+                         canonicalAlias);
 
         for (const auto &i : membersMap)
         {
-- 
cgit v1.2.3