summary refs log tree commit diff
path: root/src/encryption/Olm.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-04-11 00:11:46 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-04-11 01:38:46 +0200
commit10b65b78fa8265dbeeb33e755fafcd642b21b514 (patch)
tree937cd43488aa8e938937a79422cd09966422874f /src/encryption/Olm.cpp
parentMerge pull request #1407 from Nheko-Reborn/ducktyping (diff)
downloadnheko-10b65b78fa8265dbeeb33e755fafcd642b21b514.tar.xz
Adapt to the new inherited variant
Diffstat (limited to 'src/encryption/Olm.cpp')
-rw-r--r--src/encryption/Olm.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/encryption/Olm.cpp b/src/encryption/Olm.cpp

index cde8db96..733ce94f 100644 --- a/src/encryption/Olm.cpp +++ b/src/encryption/Olm.cpp
@@ -1273,13 +1273,13 @@ decryptEvent(const MegolmSessionIndex &index, body["origin_server_ts"] = event.origin_server_ts; body["unsigned"] = event.unsigned_data; - mtx::events::collections::TimelineEvent te; - from_json(body, te); + mtx::events::collections::TimelineEvents te = + body.get<mtx::events::collections::TimelineEvents>(); // relations are unencrypted in content... - mtx::accessors::set_relations(te.data, std::move(event.content.relations)); + mtx::accessors::set_relations(te, std::move(event.content.relations)); - return {DecryptionErrorCode::NoError, std::nullopt, std::move(te.data)}; + return {DecryptionErrorCode::NoError, std::nullopt, std::move(te)}; } catch (std::exception &e) { return {DecryptionErrorCode::ParsingFailed, e.what(), std::nullopt}; }