Remove a few more QPairs

This commit is contained in:
Nicolas Werner 2023-06-03 02:05:56 +02:00
parent c7976514ff
commit 9e983b1584
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9

View file

@ -1306,7 +1306,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 nlohmann::json(e); }, event); nlohmann::json ev_json = std::visit([](const auto &e) { return nlohmann::json(e); }, event);
@ -1569,13 +1569,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",