diff options
| author | Black Hat <bhat@encom.eu.org> | 2019-12-29 21:42:10 +0800 |
|---|---|---|
| committer | Black Hat <bhat@encom.eu.org> | 2019-12-29 21:42:10 +0800 |
| commit | 7d55e22ee3465e75e5ac7750bb1d205eb555761d (patch) | |
| tree | 36f7fcef622c44aca8d46514395126280111ed8a /lib/events/roomevent.cpp | |
| parent | e0c01b6fee5027211bd44a39860e40a2b7b226ad (diff) | |
| parent | 16d6700950f5f0ebd71481efd5e1a24f04e3c651 (diff) | |
| download | libquotient-7d55e22ee3465e75e5ac7750bb1d205eb555761d.tar.gz libquotient-7d55e22ee3465e75e5ac7750bb1d205eb555761d.zip | |
Merge branch 'master' of https://github.com/quotient-im/libQuotient into bhat-powerlevel
Diffstat (limited to 'lib/events/roomevent.cpp')
| -rw-r--r-- | lib/events/roomevent.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp index 971d8597..a59cd6e0 100644 --- a/lib/events/roomevent.cpp +++ b/lib/events/roomevent.cpp @@ -36,17 +36,15 @@ 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 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]); } |