From e8eeb480d51b6fc60c9807dd92195e9068582592 Mon Sep 17 00:00:00 2001 From: Chethan2k1 <40890937+Chethan2k1@users.noreply.github.com> Date: Fri, 4 Sep 2020 12:02:24 +0530 Subject: Fix Wrong Emojis Issue in Room Verification --- src/timeline/EventStore.cpp | 231 ++++++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 103 deletions(-) (limited to 'src/timeline/EventStore.cpp') diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index bfc16a02..e5eaefb8 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -32,38 +32,40 @@ EventStore::EventStore(std::string room_id, QObject *) this->last = range->last; } - connect(this, - &EventStore::eventFetched, - this, - [this](std::string id, - std::string relatedTo, - mtx::events::collections::TimelineEvents timeline) { - cache::client()->storeEvent(room_id_, id, {timeline}); - - if (!relatedTo.empty()) { - auto idx = idToIndex(relatedTo); - if (idx) - emit dataChanged(*idx, *idx); - } - }, - Qt::QueuedConnection); - - connect(this, - &EventStore::oldMessagesRetrieved, - this, - [this](const mtx::responses::Messages &res) { - uint64_t newFirst = cache::client()->saveOldMessages(room_id_, res); - if (newFirst == first && !res.chunk.empty()) - fetchMore(); - else { - emit beginInsertRows(toExternalIdx(newFirst), - toExternalIdx(this->first - 1)); - this->first = newFirst; - emit endInsertRows(); - emit fetchedMore(); - } - }, - Qt::QueuedConnection); + connect( + this, + &EventStore::eventFetched, + this, + [this](std::string id, + std::string relatedTo, + mtx::events::collections::TimelineEvents timeline) { + cache::client()->storeEvent(room_id_, id, {timeline}); + + if (!relatedTo.empty()) { + auto idx = idToIndex(relatedTo); + if (idx) + emit dataChanged(*idx, *idx); + } + }, + Qt::QueuedConnection); + + connect( + this, + &EventStore::oldMessagesRetrieved, + this, + [this](const mtx::responses::Messages &res) { + uint64_t newFirst = cache::client()->saveOldMessages(room_id_, res); + if (newFirst == first) + fetchMore(); + else { + emit beginInsertRows(toExternalIdx(newFirst), + toExternalIdx(this->first - 1)); + this->first = newFirst; + emit endInsertRows(); + emit fetchedMore(); + } + }, + Qt::QueuedConnection); connect(this, &EventStore::processPending, this, [this]() { if (!current_txn.empty()) { @@ -128,46 +130,48 @@ EventStore::EventStore(std::string room_id, QObject *) event->data); }); - connect(this, - &EventStore::messageFailed, - this, - [this](std::string txn_id) { - if (current_txn == txn_id) { - current_txn_error_count++; - if (current_txn_error_count > 10) { - nhlog::ui()->debug("failing txn id '{}'", txn_id); - cache::client()->removePendingStatus(room_id_, txn_id); - current_txn_error_count = 0; - } - } - QTimer::singleShot(1000, this, [this]() { - nhlog::ui()->debug("timeout"); - this->current_txn = ""; - emit processPending(); - }); - }, - Qt::QueuedConnection); - - connect(this, - &EventStore::messageSent, - this, - [this](std::string txn_id, std::string event_id) { - nhlog::ui()->debug("sent {}", txn_id); - - http::client()->read_event( - room_id_, event_id, [this, event_id](mtx::http::RequestErr err) { - if (err) { - nhlog::net()->warn( - "failed to read_event ({}, {})", room_id_, event_id); - } - }); - - cache::client()->removePendingStatus(room_id_, txn_id); - this->current_txn = ""; - this->current_txn_error_count = 0; - emit processPending(); - }, - Qt::QueuedConnection); + connect( + this, + &EventStore::messageFailed, + this, + [this](std::string txn_id) { + if (current_txn == txn_id) { + current_txn_error_count++; + if (current_txn_error_count > 10) { + nhlog::ui()->debug("failing txn id '{}'", txn_id); + cache::client()->removePendingStatus(room_id_, txn_id); + current_txn_error_count = 0; + } + } + QTimer::singleShot(1000, this, [this]() { + nhlog::ui()->debug("timeout"); + this->current_txn = ""; + emit processPending(); + }); + }, + Qt::QueuedConnection); + + connect( + this, + &EventStore::messageSent, + this, + [this](std::string txn_id, std::string event_id) { + nhlog::ui()->debug("sent {}", txn_id); + + http::client()->read_event( + room_id_, event_id, [this, event_id](mtx::http::RequestErr err) { + if (err) { + nhlog::net()->warn( + "failed to read_event ({}, {})", room_id_, event_id); + } + }); + + cache::client()->removePendingStatus(room_id_, txn_id); + this->current_txn = ""; + this->current_txn_error_count = 0; + emit processPending(); + }, + Qt::QueuedConnection); } void @@ -280,50 +284,77 @@ EventStore::handleSync(const mtx::responses::Timeline &events) if (auto encrypted = std::get_if>( &event)) { - auto event = decryptEvent({room_id_, encrypted->event_id}, *encrypted); + auto d_event = decryptEvent({room_id_, encrypted->event_id}, *encrypted); if (std::visit( [](auto e) { return (e.sender != utils::localUser().toStdString()); }, - *event)) { - if (auto msg = std::get_if>(event)) { + *d_event)) { + if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); last_verification_request_event = *msg; - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); last_verification_cancel_event = *msg; ChatPage::instance()->recievedDeviceVerificationCancel( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationAccept( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationKey( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationMac( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationReady( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationDone( msg->content); - } else if (auto msg = std::get_if>(event)) { + continue; + } else if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); ChatPage::instance()->recievedDeviceVerificationStart( msg->content, msg->sender); + continue; + } + } else { + // only the key.verification.ready sent by localuser's other device + // is of significance as it is used for detecting accepted request + if (std::get_if>(d_event)) { + auto msg = std::get_if>(d_event); + ChatPage::instance()->recievedDeviceVerificationReady( + msg->content); } - } - // only the key.verification.ready sent by localuser's other device is of - // significance as it is used for detecting accepted request - if (auto msg = std::get_if< - mtx::events::RoomEvent>( - event)) { - ChatPage::instance()->recievedDeviceVerificationReady(msg->content); } } } @@ -614,12 +645,6 @@ EventStore::decryptEvent(const IdIndex &idx, return asCacheEntry(std::move(temp_events[0])); } - dummy.content.body = tr("-- Encrypted Event (Unknown event type) --", - "Placeholder, when the message was decrypted, but we " - "couldn't parse it, because " - "Nheko/mtxclient don't support that event type yet.") - .toStdString(); - return asCacheEntry(std::move(dummy)); auto encInfo = mtx::accessors::file(decryptionResult.event.value()); if (encInfo) emit newEncryptedImage(encInfo.value()); -- cgit 1.5.1