From 5ef3250994d21954ae3736f42611268bbe03ad0e Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 20 Nov 2021 22:48:04 +0100 Subject: Add a filter for direct chats fixes #317 --- src/timeline/RoomlistModel.cpp | 150 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 132 insertions(+), 18 deletions(-) (limited to 'src/timeline/RoomlistModel.cpp') diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index cc9ff800..53fd9498 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -95,6 +95,10 @@ RoomlistModel::data(const QModelIndex &index, int role) const return list; } else if (role == Roles::RoomId) { return roomid; + } else if (role == Roles::IsDirect) { + return directChatToUser.count(roomid) > 0; + } else if (role == Roles::DirectChatOtherUserId) { + return directChatToUser.count(roomid) ? directChatToUser.at(roomid).front() : ""; } if (models.contains(roomid)) { @@ -129,10 +133,6 @@ RoomlistModel::data(const QModelIndex &index, int role) const list.push_back(QString::fromStdString(t)); return list; } - case Roles::IsDirect: - return room->isDirect(); - case Roles::DirectChatOtherUserId: - return room->directChatOtherUserId(); default: return {}; } @@ -162,12 +162,6 @@ RoomlistModel::data(const QModelIndex &index, int role) const return false; case Roles::Tags: return QStringList(); - case Roles::IsDirect: - // The list of users from the room doesn't contain the invited - // users, so we won't factor the invite into the count - return room.member_count == 1; - case Roles::DirectChatOtherUserId: - return cache::getMembersFromInvite(roomid.toStdString(), 0, 1).front().user_id; default: return {}; } @@ -199,10 +193,6 @@ RoomlistModel::data(const QModelIndex &index, int role) const return true; case Roles::Tags: return QStringList(); - case Roles::IsDirect: - return false; - case Roles::DirectChatOtherUserId: - return QString{}; // should never be reached default: return {}; } @@ -443,10 +433,69 @@ RoomlistModel::fetchPreview(QString roomid_) const }); } +std::set +RoomlistModel::updateDMs(mtx::events::AccountDataEvent event) +{ + std::set roomsToUpdate; + std::map> directChatToUserTemp; + + for (const auto &[user, rooms] : event.content.user_to_rooms) { + QString u = QString::fromStdString(user); + + for (const auto &r : rooms) { + directChatToUserTemp[QString::fromStdString(r)].push_back(u); + } + } + + for (auto l = directChatToUser.begin(), r = directChatToUserTemp.begin(); + l != directChatToUser.end() && r != directChatToUserTemp.end();) { + if (l == directChatToUser.end()) { + while (r != directChatToUserTemp.end()) { + roomsToUpdate.insert(r->first); + ++r; + } + } else if (r == directChatToUserTemp.end()) { + while (l != directChatToUser.end()) { + roomsToUpdate.insert(l->first); + ++l; + } + } else if (l->first == r->first) { + if (l->second != r->second) + roomsToUpdate.insert(l->first); + + ++l; + ++r; + } else if (l->first < r->first) { + roomsToUpdate.insert(l->first); + ++l; + } else if (l->first > r->first) { + roomsToUpdate.insert(r->first); + ++r; + } else { + throw std::logic_error("Infinite loop when updating DMs!"); + } + } + + this->directChatToUser = directChatToUserTemp; + + return roomsToUpdate; +} + void -RoomlistModel::sync(const mtx::responses::Rooms &rooms) +RoomlistModel::sync(const mtx::responses::Sync &sync_) { - for (const auto &[room_id, room] : rooms.join) { + for (const auto &e : sync_.account_data.events) { + if (auto event = + std::get_if>(&e)) { + auto updatedDMs = updateDMs(*event); + for (const auto &r : updatedDMs) { + if (auto idx = roomidToIndex(r); idx != -1) + emit dataChanged(index(idx), index(idx), {IsDirect, DirectChatOtherUserId}); + } + } + } + + for (const auto &[room_id, room] : sync_.rooms.join) { auto qroomid = QString::fromStdString(room_id); // addRoom will only add the room, if it doesn't exist @@ -477,7 +526,7 @@ RoomlistModel::sync(const mtx::responses::Rooms &rooms) } } - for (const auto &[room_id, room] : rooms.leave) { + for (const auto &[room_id, room] : sync_.rooms.leave) { (void)room; auto qroomid = QString::fromStdString(room_id); @@ -497,7 +546,7 @@ RoomlistModel::sync(const mtx::responses::Rooms &rooms) } } - for (const auto &[room_id, room] : rooms.invite) { + for (const auto &[room_id, room] : sync_.rooms.invite) { (void)room; auto qroomid = QString::fromStdString(room_id); @@ -527,6 +576,15 @@ RoomlistModel::initializeRooms() invites.clear(); currentRoom_ = nullptr; + auto e = cache::client()->getAccountData(mtx::events::EventType::Direct); + if (e) { + if (auto event = + std::get_if>( + &e.value())) { + updateDMs(*event); + } + } + invites = cache::client()->invites(); for (const auto &id : invites.keys()) roomids.push_back(id); @@ -756,11 +814,14 @@ FilteredRoomlistModel::updateHiddenTagsAndSpaces() { hiddenTags.clear(); hiddenSpaces.clear(); + hideDMs = false; for (const auto &t : UserSettings::instance()->hiddenTags()) { if (t.startsWith("tag:")) hiddenTags.push_back(t.mid(4)); else if (t.startsWith("space:")) hiddenSpaces.push_back(t.mid(6)); + else if (t == "dm") + hideDMs = true; } invalidateFilter(); @@ -801,7 +862,48 @@ FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) cons return false; } + if (hideDMs) { + return !sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsDirect) + .toBool(); + } + return true; + } else if (filterType == FilterBy::DirectChats) { + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsPreview) + .toBool()) { + return false; + } + + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsSpace) + .toBool()) { + return false; + } + + if (!hiddenTags.empty()) { + auto tags = sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::Tags) + .toStringList(); + + for (const auto &t : tags) + if (hiddenTags.contains(t)) + return false; + } + + if (!hiddenSpaces.empty()) { + auto parents = sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::ParentSpaces) + .toStringList(); + for (const auto &t : parents) + if (hiddenSpaces.contains(t)) + return false; + } + + return sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsDirect) + .toBool(); } else if (filterType == FilterBy::Tag) { if (sourceModel() ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsPreview) @@ -837,6 +939,12 @@ FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) cons return false; } + if (hideDMs) { + return !sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsDirect) + .toBool(); + } + return true; } else if (filterType == FilterBy::Space) { if (filterStr == sourceModel() @@ -874,6 +982,12 @@ FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) cons return false; } + if (hideDMs) { + return !sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsDirect) + .toBool(); + } + return true; } else { return true; -- cgit 1.5.1 From 3d92e8ae606024f5054795281ccd488abee1795a Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 21 Nov 2021 05:23:38 +0100 Subject: Mark rooms as direct chats Either by accepting an invite or manually using /converttodm and revert with /converttoroom. --- src/ChatPage.cpp | 4 +-- src/Utils.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++ src/Utils.h | 7 +++++ src/timeline/InputBar.cpp | 5 ++++ src/timeline/RoomlistModel.cpp | 2 ++ 5 files changed, 79 insertions(+), 2 deletions(-) (limited to 'src/timeline/RoomlistModel.cpp') diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index bd85dc75..c1c7eb7d 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -660,8 +660,8 @@ ChatPage::trySync() http::client()->sync( opts, [this, since = opts.since](const mtx::responses::Sync &res, mtx::http::RequestErr err) { if (err) { - const auto error = QString::fromStdString(err->matrix_error.error); - const auto msg = tr("Please try to login again: %1").arg(error); + const auto error = QString::fromStdString(err->matrix_error.error); + const auto msg = tr("Please try to login again: %1").arg(error); if ((http::is_logged_in() && (err->matrix_error.errcode == mtx::errors::ErrorCode::M_UNKNOWN_TOKEN || diff --git a/src/Utils.cpp b/src/Utils.cpp index 59b02298..dda6f685 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -27,6 +27,7 @@ #include "Cache.h" #include "Config.h" #include "EventAccessors.h" +#include "Logging.h" #include "MatrixClient.h" #include "UserSettingsPage.h" @@ -813,3 +814,65 @@ utils::isReply(const mtx::events::collections::TimelineEvents &e) { return mtx::accessors::relations(e).reply_to().has_value(); } + +void +utils::removeDirectFromRoom(QString roomid) +{ + http::client()->get_account_data( + [roomid](mtx::events::account_data::Direct ev, mtx::http::RequestErr e) { + if (e && e->status_code == 404) + ev = {}; + else if (e) { + nhlog::net()->error("Failed to retrieve m.direct: {}", *e); + return; + } + + auto r = roomid.toStdString(); + + for (auto it = ev.user_to_rooms.begin(); it != ev.user_to_rooms.end();) { + for (auto rit = it->second.begin(); rit != it->second.end();) { + if (r == *rit) + rit = it->second.erase(rit); + else + ++rit; + } + + if (it->second.empty()) + it = ev.user_to_rooms.erase(it); + else + ++it; + } + + http::client()->put_account_data(ev, [r](mtx::http::RequestErr e) { + if (e) + nhlog::net()->error("Failed to update m.direct: {}", *e); + }); + }); +} +void +utils::markRoomAsDirect(QString roomid, std::vector members) +{ + http::client()->get_account_data( + [roomid, members](mtx::events::account_data::Direct ev, mtx::http::RequestErr e) { + if (e && e->status_code == 404) + ev = {}; + else if (e) { + nhlog::net()->error("Failed to retrieve m.direct: {}", *e); + return; + } + + auto local = utils::localUser(); + auto r = roomid.toStdString(); + + for (const auto &m : members) { + if (m.user_id != local) { + ev.user_to_rooms[m.user_id.toStdString()].push_back(r); + } + } + + http::client()->put_account_data(ev, [r](mtx::http::RequestErr e) { + if (e) + nhlog::net()->error("Failed to update m.direct: {}", *e); + }); + }); +} diff --git a/src/Utils.h b/src/Utils.h index da82ec7c..701ec8fc 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -6,6 +6,7 @@ #include +#include #include #include #include @@ -304,4 +305,10 @@ readImage(const QByteArray &data); bool isReply(const mtx::events::collections::TimelineEvents &e); + +void +removeDirectFromRoom(QString roomid); + +void +markRoomAsDirect(QString roomid, std::vector members); } diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 44df3411..bd4f59d8 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -645,6 +645,11 @@ InputBar::command(QString command, QString args) return; } nhlog::net()->error("Could not resolve goto: {}", args.toStdString()); + } else if (command == "converttodm") { + utils::markRoomAsDirect(this->room->roomId(), + cache::getMembers(this->room->roomId().toStdString(), 0, -1)); + } else if (command == "converttoroom") { + utils::removeDirectFromRoom(this->room->roomId()); } } diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 53fd9498..7d727659 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -627,6 +627,8 @@ RoomlistModel::acceptInvite(QString roomid) if (invites.contains(roomid)) { // Don't remove invite yet, so that we can switch to it ChatPage::instance()->joinRoom(roomid); + utils::markRoomAsDirect(roomid, + cache::client()->getMembersFromInvite(roomid.toStdString(), 0, -1)); } } void -- cgit 1.5.1 From e7d4aec6ecf65ad970c341e30949218e4472944a Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 21 Nov 2021 07:06:37 +0100 Subject: Only mark as direct, if invite was direct --- src/Cache.cpp | 8 ++++++-- src/CacheStructs.h | 2 ++ src/timeline/RoomlistModel.cpp | 15 ++++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) (limited to 'src/timeline/RoomlistModel.cpp') diff --git a/src/Cache.cpp b/src/Cache.cpp index c22cd0d6..4f96f430 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -1640,7 +1640,7 @@ Cache::saveInvite(lmdb::txn &txn, auto display_name = msg->content.display_name.empty() ? msg->state_key : msg->content.display_name; - MemberInfo tmp{display_name, msg->content.avatar_url}; + MemberInfo tmp{display_name, msg->content.avatar_url, msg->content.is_direct}; membersdb.put(txn, msg->state_key, json(tmp).dump()); } else { @@ -2777,7 +2777,8 @@ Cache::getMembersFromInvite(const std::string &room_id, std::size_t startIndex, try { MemberInfo tmp = json::parse(user_data); members.emplace_back(RoomMember{QString::fromStdString(std::string(user_id)), - QString::fromStdString(tmp.name)}); + QString::fromStdString(tmp.name), + tmp.is_direct}); } catch (const json::exception &e) { nhlog::db()->warn("{}", e.what()); } @@ -4563,6 +4564,8 @@ to_json(json &j, const MemberInfo &info) { j["name"] = info.name; j["avatar_url"] = info.avatar_url; + if (info.is_direct) + j["is_direct"] = info.is_direct; } void @@ -4570,6 +4573,7 @@ from_json(const json &j, MemberInfo &info) { info.name = j.at("name"); info.avatar_url = j.at("avatar_url"); + info.is_direct = j.value("is_direct", false); } void diff --git a/src/CacheStructs.h b/src/CacheStructs.h index e28f5b2d..01a050da 100644 --- a/src/CacheStructs.h +++ b/src/CacheStructs.h @@ -26,6 +26,7 @@ struct RoomMember { QString user_id; QString display_name; + bool is_direct = false; }; //! Used to uniquely identify a list of read receipts. @@ -98,6 +99,7 @@ struct MemberInfo { std::string name; std::string avatar_url; + bool is_direct = false; }; void diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 7d727659..79324628 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -586,8 +586,9 @@ RoomlistModel::initializeRooms() } invites = cache::client()->invites(); - for (const auto &id : invites.keys()) + for (const auto &id : invites.keys()) { roomids.push_back(id); + } for (const auto &id : cache::client()->roomIds()) addRoom(id, true); @@ -626,9 +627,17 @@ RoomlistModel::acceptInvite(QString roomid) { if (invites.contains(roomid)) { // Don't remove invite yet, so that we can switch to it + auto members = cache::getMembersFromInvite(roomid.toStdString(), 0, -1); + auto local = utils::localUser(); + for (const auto &m : members) { + if (m.user_id == local && m.is_direct) { + nhlog::db()->info("marking {} as direct", roomid.toStdString()); + utils::markRoomAsDirect(roomid, members); + break; + } + } + ChatPage::instance()->joinRoom(roomid); - utils::markRoomAsDirect(roomid, - cache::client()->getMembersFromInvite(roomid.toStdString(), 0, -1)); } } void -- cgit 1.5.1