New upstream version 0.7.0

1 files changed, 56 insertions, 69 deletions

diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 80d121de..e98cb591 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -1,88 +1,76 @@
-/******************************************************************************
-* 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 "roomevent.h"
 
-#include "redactionevent.h"
-#include "converters.h"
 #include "logging.h"
+#include "redactionevent.h"
 
-using namespace QMatrixClient;
-
-[[gnu::unused]] static auto roomEventTypeInitialised =
-        Event::factory_t::chainFactory<RoomEvent>();
-
-RoomEvent::RoomEvent(Type type, event_mtype_t matrixType,
-                     const QJsonObject& contentJson)
-    : Event(type, matrixType, contentJson)
-{ }
+using namespace Quotient;
 
-RoomEvent::RoomEvent(Type type, const QJsonObject& json)
-    : Event(type, json)
+RoomEvent::RoomEvent(const QJsonObject& json) : Event(json)
 {
-    const auto unsignedData = json[UnsignedKeyL].toObject();
-    const auto redaction = unsignedData[RedactedCauseKeyL];
-    if (redaction.isObject())
-    {
-        _redactedBecause = makeEvent<RedactionEvent>(redaction.toObject());
-        return;
-    }
-
-    const auto& txnId = transactionId();
-    if (!txnId.isEmpty())
-        qCDebug(EVENTS) << "Event transactionId:" << txnId;
+    if (const auto redaction = unsignedPart<QJsonObject>(RedactedCauseKeyL);
+        !redaction.isEmpty())
+        _redactedBecause = loadEvent<RedactionEvent>(redaction);
 }
 
 RoomEvent::~RoomEvent() = default; // Let the smart pointer do its job
 
-QString RoomEvent::id() const
-{
-    return fullJson()[EventIdKeyL].toString();
-}
+QString RoomEvent::id() const { return fullJson()[EventIdKeyL].toString(); }
 
-QDateTime RoomEvent::timestamp() const
+QDateTime RoomEvent::originTimestamp() const
 {
-    return QMatrixClient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
+    return Quotient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
 }
 
 QString RoomEvent::roomId() const
 {
-    return fullJson()["room_id"_ls].toString();
+    return fullJson()[RoomIdKeyL].toString();
 }
 
 QString RoomEvent::senderId() const
 {
-    return fullJson()["sender"_ls].toString();
+    return fullJson()[SenderKeyL].toString();
+}
+
+bool RoomEvent::isReplaced() const
+{
+    return unsignedPart<QJsonObject>("m.relations"_ls).contains("m.replace");
+}
+
+QString RoomEvent::replacedBy() const
+{
+    // clang-format off
+    return unsignedPart<QJsonObject>("m.relations"_ls)
+            .value("m.replace"_ls).toObject()
+            .value(EventIdKeyL).toString();
+    // clang-format on
 }
 
 QString RoomEvent::redactionReason() const
 {
-    return isRedacted() ? _redactedBecause->reason() : QString{};
+    return isRedacted() ? _redactedBecause->reason() : QString {};
 }
 
 QString RoomEvent::transactionId() const
 {
-    return unsignedJson()["transaction_id"_ls].toString();
+    return unsignedPart<QString>("transaction_id"_ls);
 }
 
 QString RoomEvent::stateKey() const
 {
-    return fullJson()["state_key"_ls].toString();
+    return fullJson()[StateKeyKeyL].toString();
+}
+
+void RoomEvent::setRoomId(const QString& roomId)
+{
+    editJson().insert(RoomIdKey, roomId);
+}
+
+void RoomEvent::setSender(const QString& senderId)
+{
+    editJson().insert(SenderKey, senderId);
 }
 
 void RoomEvent::setTransactionId(const QString& txnId)
@@ -90,36 +78,35 @@ void RoomEvent::setTransactionId(const QString& txnId)
     auto unsignedData = fullJson()[UnsignedKeyL].toObject();
     unsignedData.insert(QStringLiteral("transaction_id"), txnId);
     editJson().insert(UnsignedKey, unsignedData);
-    qCDebug(EVENTS) << "New event transactionId:" << txnId;
     Q_ASSERT(transactionId() == txnId);
 }
 
 void RoomEvent::addId(const QString& newId)
 {
-    Q_ASSERT(id().isEmpty()); Q_ASSERT(!newId.isEmpty());
+    Q_ASSERT(id().isEmpty());
+    Q_ASSERT(!newId.isEmpty());
     editJson().insert(EventIdKey, newId);
     qCDebug(EVENTS) << "Event txnId -> id:" << transactionId() << "->" << id();
     Q_ASSERT(id() == newId);
 }
 
-QJsonObject makeCallContentJson(const QString& callId, int version,
-                                QJsonObject content)
+void RoomEvent::dumpTo(QDebug dbg) const
 {
-    content.insert(QStringLiteral("call_id"), callId);
-    content.insert(QStringLiteral("version"), version);
-    return content;
+    Event::dumpTo(dbg);
+    dbg << " (made at " << originTimestamp().toString(Qt::ISODate) << ')';
 }
 
-CallEventBase::CallEventBase(Type type, event_mtype_t matrixType,
-                             const QString& callId, int version,
-                             const QJsonObject& contentJson)
-    : RoomEvent(type, matrixType,
-                makeCallContentJson(callId, version, contentJson))
-{ }
+#ifdef Quotient_E2EE_ENABLED
+void RoomEvent::setOriginalEvent(event_ptr_tt<RoomEvent>&& originalEvent)
+{
+    _originalEvent = std::move(originalEvent);
+}
 
-CallEventBase::CallEventBase(Event::Type type, const QJsonObject& json)
-    : RoomEvent(type, json)
+const QJsonObject RoomEvent::encryptedJson() const
 {
-    if (callId().isEmpty())
-        qCWarning(EVENTS) << id() << "is a call event with an empty call id";
+    if(!_originalEvent) {
+        return {};
+    }
+    return _originalEvent->fullJson();
 }
+#endif