Merge branch 'upstream' (v0.5.2)

1 files changed, 20 insertions, 2 deletions

diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index 877d0fae..a84f302b 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -20,17 +20,20 @@
 
 using namespace QMatrixClient;
 
+// Aside from the normal factory to instantiate StateEventBase inheritors
+// StateEventBase itself can be instantiated if there's a state_key JSON key
+// but the event type is unknown.
 [[gnu::unused]] static auto stateEventTypeInitialised =
     RoomEvent::factory_t::addMethod(
         [] (const QJsonObject& json, const QString& matrixType) -> StateEventPtr
         {
-            if (!json.contains("state_key"))
+            if (!json.contains("state_key"_ls))
                 return nullptr;
 
             if (auto e = StateEventBase::factory_t::make(json, matrixType))
                 return e;
 
-            return nullptr;
+            return makeEvent<StateEventBase>(unknownEventTypeId(), json);
         });
 
 bool StateEventBase::repeatsState() const
@@ -38,3 +41,18 @@ bool StateEventBase::repeatsState() const
     const auto prevContentJson = unsignedJson().value(PrevContentKeyL);
     return fullJson().value(ContentKeyL) == prevContentJson;
 }
+
+QString StateEventBase::replacedState() const
+{
+    return unsignedJson().value("replaces_state"_ls).toString();
+}
+
+void StateEventBase::dumpTo(QDebug dbg) const
+{
+    if (!stateKey().isEmpty())
+        dbg << '<' << stateKey() << "> ";
+    if (unsignedJson().contains(PrevContentKeyL))
+        dbg << QJsonDocument(unsignedJson()[PrevContentKeyL].toObject())
+               .toJson(QJsonDocument::Compact) << " -> ";
+    RoomEvent::dumpTo(dbg);
+}