d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-27 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

QPair is just an alias now

Browse source
This commit is contained in:
Nicolas Werner 2022-04-16 04:32:06 +02:00
parent 6fbb755277
commit d7eb62a5b5
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/encryption/Olm.cpp
View file

@ -1209,7 +1209,7 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
const mtx::events::collections::DeviceEvents &event, const mtx::events::collections::DeviceEvents &event,
bool force_new_session) bool force_new_session)
{ {
static QMap<QPair<std::string, std::string>, qint64> rateLimit; static QMap<std::pair<std::string, std::string>, qint64> rateLimit;
nlohmann::json ev_json = std::visit([](const auto &e) { return json(e); }, event); nlohmann::json ev_json = std::visit([](const auto &e) { return json(e); }, event);
@ -1263,12 +1263,12 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
auto session = cache::getLatestOlmSession(device_curve); auto session = cache::getLatestOlmSession(device_curve);
if (!session || force_new_session) { if (!session || force_new_session) {
auto currentTime = QDateTime::currentSecsSinceEpoch(); auto currentTime = QDateTime::currentSecsSinceEpoch();
if (rateLimit.value(QPair(user, device)) + 60 * 60 * 10 < currentTime) { if (rateLimit.value(std::pair(user, device)) + 60 * 60 * 10 < currentTime) {
claims.one_time_keys[user][device] = mtx::crypto::SIGNED_CURVE25519; claims.one_time_keys[user][device] = mtx::crypto::SIGNED_CURVE25519;
pks[user][device].ed25519 = d.keys.at("ed25519:" + device); pks[user][device].ed25519 = d.keys.at("ed25519:" + device);
pks[user][device].curve25519 = d.keys.at("curve25519:" + device); pks[user][device].curve25519 = d.keys.at("curve25519:" + device);
rateLimit.insert(QPair(user, device), currentTime); rateLimit.insert(std::pair(user, device), currentTime);
} else { } else {
nhlog::crypto()->warn("Not creating new session with {}:{} " nhlog::crypto()->warn("Not creating new session with {}:{} "
"because of rate limit", "because of rate limit",
@ -1461,13 +1461,13 @@ send_encrypted_to_device_messages(const std::map<std::string, std::vector<std::s
} }
auto currentTime = QDateTime::currentSecsSinceEpoch(); auto currentTime = QDateTime::currentSecsSinceEpoch();
if (rateLimit.value(QPair(user.first, device_id.get())) + 60 * 60 * 10 < if (rateLimit.value(std::pair(user.first, device_id.get())) + 60 * 60 * 10 <
currentTime) { currentTime) {
deviceKeys[user_id].emplace(device_id, pks); deviceKeys[user_id].emplace(device_id, pks);
claim_keys.one_time_keys[user.first][device_id] = claim_keys.one_time_keys[user.first][device_id] =
mtx::crypto::SIGNED_CURVE25519; mtx::crypto::SIGNED_CURVE25519;
rateLimit.insert(QPair(user.first, device_id.get()), currentTime); rateLimit.insert(std::pair(user.first, device_id.get()), currentTime);
} else { } else {
nhlog::crypto()->warn("Not creating new session with {}:{} " nhlog::crypto()->warn("Not creating new session with {}:{} "
"because of rate limit", "because of rate limit",