mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #365 from Nheko-Reborn/typing

Browse Source 
Typing flickering fixes
pull/369/head
DeepBlueV7.X 4 years ago committed by GitHub
parent a13502b881 3a41bb9fff
commit 133302d334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 2
      io.github.NhekoReborn.Nheko.json
  3. 9
      resources/qml/MessageView.qml
  4. 77
      src/Cache.cpp
  5. 19
      src/timeline/TimelineViewManager.cpp

2
CMakeLists.txt
Unescape View File

@ -356,7 +356,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG ce8bc9c3dd6bba432e716f55136133111b0186e7 GIT_TAG cad81d1677a4845366b93112f8f2e267ee8c9ae0
) )
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
io.github.NhekoReborn.Nheko.json
Unescape View File

@ -162,7 +162,7 @@
"name": "mtxclient", "name": "mtxclient",
"sources": [ "sources": [
{ {
"commit": "ce8bc9c3dd6bba432e716f55136133111b0186e7", "commit": "cad81d1677a4845366b93112f8f2e267ee8c9ae0",
"type": "git", "type": "git",
"url": "https://github.com/Nheko-Reborn/mtxclient.git" "url": "https://github.com/Nheko-Reborn/mtxclient.git"
} }

9
resources/qml/MessageView.qml
Unescape View File

@ -140,6 +140,15 @@ ListView {
} }
Label {
color: colors.buttonText
text: TimelineManager.userStatus(modelData.userId)
textFormat: Text.PlainText
elide: Text.ElideRight
width: chat.delegateMaxWidth - parent.spacing * 2 - userName.implicitWidth - avatarSize
font.italic: true
}
} }
} }

77
src/Cache.cpp
Unescape View File

@ -124,17 +124,15 @@ Cache::isHiddenEvent(lmdb::txn &txn,
EventType::Reaction, EventType::CallCandidates, EventType::Unsupported}; EventType::Reaction, EventType::CallCandidates, EventType::Unsupported};
if (auto temp = getAccountData(txn, mtx::events::EventType::NhekoHiddenEvents, "")) if (auto temp = getAccountData(txn, mtx::events::EventType::NhekoHiddenEvents, ""))
hiddenEvents = std::move( hiddenEvents =
std::get< std::move(std::get<mtx::events::AccountDataEvent<
mtx::events::Event<mtx::events::account_data::nheko_extensions::HiddenEvents>>( mtx::events::account_data::nheko_extensions::HiddenEvents>>(*temp)
*temp) .content);
.content);
if (auto temp = getAccountData(txn, mtx::events::EventType::NhekoHiddenEvents, room_id)) if (auto temp = getAccountData(txn, mtx::events::EventType::NhekoHiddenEvents, room_id))
hiddenEvents = std::move( hiddenEvents =
std::get< std::move(std::get<mtx::events::AccountDataEvent<
mtx::events::Event<mtx::events::account_data::nheko_extensions::HiddenEvents>>( mtx::events::account_data::nheko_extensions::HiddenEvents>>(*temp)
*temp) .content);
.content);
return std::visit( return std::visit(
[hiddenEvents](const auto &ev) { [hiddenEvents](const auto &ev) {
@ -1197,7 +1195,7 @@ void
Cache::saveState(const mtx::responses::Sync &res) Cache::saveState(const mtx::responses::Sync &res)
{ {
using namespace mtx::events; using namespace mtx::events;
auto user_id = this->localUserId_.toStdString(); auto local_user_id = this->localUserId_.toStdString();
auto currentBatchToken = nextBatchToken(); auto currentBatchToken = nextBatchToken();
@ -1252,13 +1250,19 @@ Cache::saveState(const mtx::responses::Sync &res)
evt); evt);
// for tag events // for tag events
if (std::holds_alternative<Event<account_data::Tags>>(evt)) { if (std::holds_alternative<AccountDataEvent<account_data::Tags>>(
auto tags_evt = std::get<Event<account_data::Tags>>(evt); evt)) {
has_new_tags = true; auto tags_evt =
std::get<AccountDataEvent<account_data::Tags>>(evt);
has_new_tags = true;
for (const auto &tag : tags_evt.content.tags) { for (const auto &tag : tags_evt.content.tags) {
updatedInfo.tags.push_back(tag.first); updatedInfo.tags.push_back(tag.first);
} }
} }
if (auto fr = std::get_if<mtx::events::AccountDataEvent<
mtx::events::account_data::FullyRead>>(&evt)) {
nhlog::db()->debug("Fully read: {}", fr->content.event_id);
}
} }
if (!has_new_tags) { if (!has_new_tags) {
// retrieve the old tags, they haven't changed // retrieve the old tags, they haven't changed
@ -1282,7 +1286,20 @@ Cache::saveState(const mtx::responses::Sync &res)
lmdb::dbi_put( lmdb::dbi_put(
txn, roomsDb_, lmdb::val(room.first), lmdb::val(json(updatedInfo).dump())); txn, roomsDb_, lmdb::val(room.first), lmdb::val(json(updatedInfo).dump()));
updateReadReceipt(txn, room.first, room.second.ephemeral.receipts); for (const auto &e : room.second.ephemeral.events) {
if (auto receiptsEv = std::get_if<
mtx::events::EphemeralEvent<mtx::events::ephemeral::Receipt>>(&e)) {
Receipts receipts;
for (const auto &[event_id, userReceipts] :
receiptsEv->content.receipts) {
for (const auto &[user_id, receipt] : userReceipts.users) {
receipts[event_id][user_id] = receipt.ts;
}
}
updateReadReceipt(txn, room.first, receipts);
}
}
// Clean up non-valid invites. // Clean up non-valid invites.
removeInvite(txn, room.first); removeInvite(txn, room.first);
@ -1302,19 +1319,27 @@ Cache::saveState(const mtx::responses::Sync &res)
std::map<QString, bool> readStatus; std::map<QString, bool> readStatus;
for (const auto &room : res.rooms.join) { for (const auto &room : res.rooms.join) {
if (!room.second.ephemeral.receipts.empty()) { for (const auto &e : room.second.ephemeral.events) {
std::vector<QString> receipts; if (auto receiptsEv = std::get_if<
for (const auto &receipt : room.second.ephemeral.receipts) { mtx::events::EphemeralEvent<mtx::events::ephemeral::Receipt>>(&e)) {
for (const auto &receiptUsersTs : receipt.second) { std::vector<QString> receipts;
if (receiptUsersTs.first != user_id) {
receipts.push_back( for (const auto &[event_id, userReceipts] :
QString::fromStdString(receipt.first)); receiptsEv->content.receipts) {
break; for (const auto &[user_id, receipt] : userReceipts.users) {
(void)receipt;
if (user_id != local_user_id) {
receipts.push_back(
QString::fromStdString(event_id));
break;
}
} }
} }
if (!receipts.empty())
emit newReadReceipts(QString::fromStdString(room.first),
receipts);
} }
if (!receipts.empty())
emit newReadReceipts(QString::fromStdString(room.first), receipts);
} }
readStatus.emplace(QString::fromStdString(room.first), readStatus.emplace(QString::fromStdString(room.first),
calculateRoomReadStatus(room.first)); calculateRoomReadStatus(room.first));
@ -1440,7 +1465,7 @@ Cache::roomsWithTagUpdates(const mtx::responses::Sync &res)
for (const auto &room : res.rooms.join) { for (const auto &room : res.rooms.join) {
bool hasUpdates = false; bool hasUpdates = false;
for (const auto &evt : room.second.account_data.events) { for (const auto &evt : room.second.account_data.events) {
if (std::holds_alternative<Event<account_data::Tags>>(evt)) { if (std::holds_alternative<AccountDataEvent<account_data::Tags>>(evt)) {
hasUpdates = true; hasUpdates = true;
} }
} }

19
src/timeline/TimelineViewManager.cpp
Unescape View File

@ -297,13 +297,20 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
&CallManager::syncEvent); &CallManager::syncEvent);
if (ChatPage::instance()->userSettings()->typingNotifications()) { if (ChatPage::instance()->userSettings()->typingNotifications()) {
std::vector<QString> typing; for (const auto &ev : room.ephemeral.events) {
typing.reserve(room.ephemeral.typing.size()); if (auto t = std::get_if<
for (const auto &user : room.ephemeral.typing) { mtx::events::EphemeralEvent<mtx::events::ephemeral::Typing>>(
if (user != http::client()->user_id().to_string()) &ev)) {
typing.push_back(QString::fromStdString(user)); std::vector<QString> typing;
typing.reserve(t->content.user_ids.size());
for (const auto &user : t->content.user_ids) {
if (user != http::client()->user_id().to_string())
typing.push_back(
QString::fromStdString(user));
}
room_model->updateTypingUsers(typing);
}
} }
room_model->updateTypingUsers(typing);
} }
} }

Write Preview
Loading…
Cancel
Save