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

Add notifications to all sidebar items

Browse source
This commit is contained in:
Loren Burkholder 2022-04-25 20:54:40 -04:00
parent f03c506bdf
commit 7e9646cc25
2 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/timeline/CommunitiesModel.cpp
View file

@ -20,7 +20,7 @@ CommunitiesModel::CommunitiesModel(QObject *parent)
connect(ChatPage::instance(), &ChatPage::unreadMessages, this, [this](int) { connect(ChatPage::instance(), &ChatPage::unreadMessages, this, [this](int) {
// Simply updating every space is easier than tracking which ones need updated. // Simply updating every space is easier than tracking which ones need updated.
if (!spaces_.empty()) if (!spaces_.empty())
emit dataChanged(index(2, 0), index(spaces_.size() + 2, 0), {Roles::UnreadMessages, Roles::HasLoudNotification}); emit dataChanged(index(0, 0), index(spaces_.size() + tags_.size() + 1, 0), {Roles::UnreadMessages, Roles::HasLoudNotification});
}); });
} }
@ -80,9 +80,17 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
return 0; return 0;
case CommunitiesModel::Roles::Id: case CommunitiesModel::Roles::Id:
return ""; return "";
case CommunitiesModel::Roles::UnreadMessages: case CommunitiesModel::Roles::UnreadMessages: {
int total{0};
for (const auto &[id, info] : cache::getRoomInfo(cache::joinedRooms()))
total += info.notification_count;
return total;
}
case CommunitiesModel::Roles::HasLoudNotification: case CommunitiesModel::Roles::HasLoudNotification:
return 0; for (const auto &[id, info] : cache::getRoomInfo(cache::joinedRooms()))
if (info.highlight_count > 0)
return true;
return false;
} }
} else if (index.row() == 1) { } else if (index.row() == 1) {
switch (role) { switch (role) {
@ -104,9 +112,17 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
return 0; return 0;
case CommunitiesModel::Roles::Id: case CommunitiesModel::Roles::Id:
return "dm"; return "dm";
case CommunitiesModel::Roles::UnreadMessages: case CommunitiesModel::Roles::UnreadMessages: {
int total{0};
for (const auto &[id, info] : cache::getRoomInfo(directMessages_))
total += info.notification_count;
return total;
}
case CommunitiesModel::Roles::HasLoudNotification: case CommunitiesModel::Roles::HasLoudNotification:
return 0; for (const auto &[id, info] : cache::getRoomInfo(directMessages_))
if (info.highlight_count > 0)
return true;
return false;
} }
} else if (index.row() - 2 < spaceOrder_.size()) { } else if (index.row() - 2 < spaceOrder_.size()) {
auto id = spaceOrder_.tree.at(index.row() - 2).id; auto id = spaceOrder_.tree.at(index.row() - 2).id;
@ -191,9 +207,22 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
return 0; return 0;
case CommunitiesModel::Roles::Id: case CommunitiesModel::Roles::Id:
return "tag:" + tag; return "tag:" + tag;
case CommunitiesModel::Roles::UnreadMessages: case CommunitiesModel::Roles::UnreadMessages: {
case CommunitiesModel::Roles::HasLoudNotification: int total{0};
return 0; auto rooms{cache::joinedRooms()};
for (const auto &[roomid, info] : cache::getRoomInfo(rooms))
if (std::find(std::begin(info.tags), std::end(info.tags), tag.toStdString()) != std::end(info.tags))
total += info.notification_count;
return total;
}
case CommunitiesModel::Roles::HasLoudNotification: {
auto rooms{cache::joinedRooms()};
for (const auto &[roomid, info] : cache::getRoomInfo(rooms))
if (std::find(std::begin(info.tags), std::end(info.tags), tag.toStdString()) != std::end(info.tags))
if (info.highlight_count > 0)
return true;
return false;
}
} }
} }
return QVariant(); return QVariant();
@ -403,8 +432,12 @@ CommunitiesModel::sync(const mtx::responses::Sync &sync_)
tagsUpdated = true; tagsUpdated = true;
} }
for (const auto &e : sync_.account_data.events) { for (const auto &e : sync_.account_data.events) {
if (std::holds_alternative< if (auto event =
mtx::events::AccountDataEvent<mtx::events::account_data::Direct>>(e)) { std::get_if<mtx::events::AccountDataEvent<mtx::events::account_data::Direct>>(&e)) {
directMessages_.clear();
for (const auto &[userId, roomIds] : event->content.user_to_rooms)
for (const auto &roomId : roomIds)
directMessages_.push_back(roomId);
tagsUpdated = true; tagsUpdated = true;
break; break;
} }

2
src/timeline/CommunitiesModel.h
View file

@ -50,6 +50,7 @@ public:
Id, Id,
UnreadMessages, UnreadMessages,
HasLoudNotification, HasLoudNotification,
IsDirect,
}; };
struct FlatTree struct FlatTree
@ -154,6 +155,7 @@ private:
QStringList hiddenTagIds_; QStringList hiddenTagIds_;
FlatTree spaceOrder_; FlatTree spaceOrder_;
std::map<QString, RoomInfo> spaces_; std::map<QString, RoomInfo> spaces_;
std::vector<std::string> directMessages_;
friend class FilteredCommunitiesModel; friend class FilteredCommunitiesModel;
}; };