New upstream version 0.7.0

1 files changed, 39 insertions, 40 deletions

diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index 47e1398c..d8f9fa0b 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -1,20 +1,5 @@
-/******************************************************************************
- * Copyright (C) 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * 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
 
 /*
 Example of a Receipt Event:
@@ -35,35 +20,49 @@ Example of a Receipt Event:
 
 #include "receiptevent.h"
 
-#include "converters.h"
 #include "logging.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
-ReceiptEvent::ReceiptEvent(const QJsonObject& obj)
-    : Event(typeId(), obj)
+// The library loads the event-ids-to-receipts JSON map into a vector because
+// map lookups are not used and vectors are massively faster. Same goes for
+// de-/serialization of ReceiptsForEvent::receipts.
+// (XXX: would this be generally preferred across CS API JSON maps?..)
+QJsonObject Quotient::toJson(const EventsWithReceipts& ewrs)
 {
-    const auto& contents = contentJson();
-    _eventsWithReceipts.reserve(contents.size());
-    for( auto eventIt = contents.begin(); eventIt != contents.end(); ++eventIt )
-    {
-        if (eventIt.key().isEmpty())
-        {
-            qCWarning(EPHEMERAL) << "ReceiptEvent has an empty event id, skipping";
-            qCDebug(EPHEMERAL) << "ReceiptEvent content follows:\n" << contents;
+    QJsonObject json;
+    for (const auto& e : ewrs) {
+        QJsonObject receiptsJson;
+        for (const auto& r : e.receipts)
+            receiptsJson.insert(r.userId,
+                                QJsonObject { { "ts"_ls, toJson(r.timestamp) } });
+        json.insert(e.evtId, QJsonObject { { "m.read"_ls, receiptsJson } });
+    }
+    return json;
+}
+
+template<>
+EventsWithReceipts Quotient::fromJson(const QJsonObject& json)
+{
+    EventsWithReceipts result;
+    result.reserve(json.size());
+    for (auto eventIt = json.begin(); eventIt != json.end(); ++eventIt) {
+        if (eventIt.key().isEmpty()) {
+            qCWarning(EPHEMERAL)
+                << "ReceiptEvent has an empty event id, skipping";
+            qCDebug(EPHEMERAL) << "ReceiptEvent content follows:\n" << json;
             continue;
         }
-        const QJsonObject reads = eventIt.value().toObject()
-                                    .value("m.read"_ls).toObject();
-        QVector<Receipt> receipts;
-        receipts.reserve(reads.size());
-        for( auto userIt = reads.begin(); userIt != reads.end(); ++userIt )
-        {
-            const QJsonObject user = userIt.value().toObject();
-            receipts.push_back({userIt.key(),
-                                fromJson<QDateTime>(user["ts"_ls])});
+        const auto reads =
+            eventIt.value().toObject().value("m.read"_ls).toObject();
+        QVector<UserTimestamp> usersAtEvent;
+        usersAtEvent.reserve(reads.size());
+        for (auto userIt = reads.begin(); userIt != reads.end(); ++userIt) {
+            const auto user = userIt.value().toObject();
+            usersAtEvent.push_back(
+                { userIt.key(), fromJson<QDateTime>(user["ts"_ls]) });
         }
-        _eventsWithReceipts.push_back({eventIt.key(), std::move(receipts)});
+        result.push_back({ eventIt.key(), std::move(usersAtEvent) });
     }
+    return result;
 }
-