thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt to the new inherited variant

Browse source
This commit is contained in:
Nicolas Werner 2023-04-11 00:11:46 +02:00
parent 7973fbce8c
commit 10b65b78fa
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
16 changed files with 99 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/encryption/Olm.cpp
View file

@ -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};
}