From fdd094a5ef3dd8a2ef06cfa1282482a60837b317 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 10 Nov 2019 19:20:09 +0900
Subject: Cleanup

---
 lib/events/roomevent.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/events/roomevent.cpp')

diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 971d8597..4a9a8b5d 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -36,10 +36,8 @@ RoomEvent::RoomEvent(Type type, const QJsonObject& json) : Event(type, json)
 {
     const auto unsignedData = json[UnsignedKeyL].toObject();
     const auto redaction = unsignedData[RedactedCauseKeyL];
-    if (redaction.isObject()) {
+    if (redaction.isObject())
         _redactedBecause = makeEvent<RedactionEvent>(redaction.toObject());
-        return;
-    }
 }
 
 RoomEvent::~RoomEvent() = default; // Let the smart pointer do its job
-- 
cgit v1.2.3


From 608e252bae9cf8cf763e05363bfacf5e1760134f Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 9 Dec 2019 18:19:53 +0300
Subject: RoomEvent::timestamp() -> originTimestamp()

The previous name is still available but deprecated.
---
 lib/events/roomevent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/events/roomevent.cpp')

diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 4a9a8b5d..a59cd6e0 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -44,7 +44,7 @@ RoomEvent::~RoomEvent() = default; // Let the smart pointer do its job
 
 QString RoomEvent::id() const { return fullJson()[EventIdKeyL].toString(); }
 
-QDateTime RoomEvent::timestamp() const
+QDateTime RoomEvent::originTimestamp() const
 {
     return Quotient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
 }
-- 
cgit v1.2.3