Modernise and fix code dealing with call events

Call events no more store deserialised values; instead they deserialise
values on the fly, same as all other events. They are no more treated as
state events (The Spec doesn't define them as state events in the first
place). A common base class, CallEventBase, is introduced that defines
data pieces common to all call events (call id and version).

1 files changed, 22 insertions, 0 deletions

diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index e9d74cf6..80d121de 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -101,3 +101,25 @@ void RoomEvent::addId(const QString& newId)
     qCDebug(EVENTS) << "Event txnId -> id:" << transactionId() << "->" << id();
     Q_ASSERT(id() == newId);
 }
+
+QJsonObject makeCallContentJson(const QString& callId, int version,
+                                QJsonObject content)
+{
+    content.insert(QStringLiteral("call_id"), callId);
+    content.insert(QStringLiteral("version"), version);
+    return content;
+}
+
+CallEventBase::CallEventBase(Type type, event_mtype_t matrixType,
+                             const QString& callId, int version,
+                             const QJsonObject& contentJson)
+    : RoomEvent(type, matrixType,
+                makeCallContentJson(callId, version, contentJson))
+{ }
+
+CallEventBase::CallEventBase(Event::Type type, const QJsonObject& json)
+    : RoomEvent(type, json)
+{
+    if (callId().isEmpty())
+        qCWarning(EVENTS) << id() << "is a call event with an empty call id";
+}