New upstream version 0.7.0

1 files changed, 33 insertions, 23 deletions

diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index fd5d2642..72ecd5ad 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -1,30 +1,40 @@
-/******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "stateevent.h"
+#include "logging.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
-[[gnu::unused]] static auto stateEventTypeInitialised =
-        RoomEvent::factory_t::chainFactory<StateEventBase>();
+StateEvent::StateEvent(const QJsonObject& json)
+    : RoomEvent(json)
+{
+    Q_ASSERT_X(json.contains(StateKeyKeyL), __FUNCTION__,
+               "Attempt to create a state event without state key");
+}
+
+StateEvent::StateEvent(Event::Type type, const QString& stateKey,
+                               const QJsonObject& contentJson)
+    : RoomEvent(basicJson(type, stateKey, contentJson))
+{}
+
+bool StateEvent::repeatsState() const
+{
+    return contentJson() == unsignedPart<QJsonObject>(PrevContentKeyL);
+}
+
+QString StateEvent::replacedState() const
+{
+    return unsignedPart<QString>("replaces_state"_ls);
+}
 
-bool StateEventBase::repeatsState() const
+void StateEvent::dumpTo(QDebug dbg) const
 {
-    const auto prevContentJson = unsignedJson().value(PrevContentKeyL);
-    return fullJson().value(ContentKeyL) == prevContentJson;
+    if (!stateKey().isEmpty())
+        dbg << '<' << stateKey() << "> ";
+    if (const auto prevContentJson = unsignedPart<QJsonObject>(PrevContentKeyL);
+        !prevContentJson.isEmpty())
+        dbg << QJsonDocument(prevContentJson).toJson(QJsonDocument::Compact)
+            << " -> ";
+    RoomEvent::dumpTo(dbg);
 }