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

Switched room importance to an enum

Browse source
This commit is contained in:
Emi Simpson 2020-03-15 10:38:56 -04:00
parent a5b388db15
commit 81c9cb5c79
No known key found for this signature in database
GPG key ID: 68FAB2E2E6DFC98B
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/RoomInfoListItem.cpp
View file

@ -324,6 +324,15 @@ RoomInfoListItem::updateUnreadMessageCount(int count, int highlightedCount)
update(); update();
} }
enum NotificationImportance : unsigned short
{
AllEventsRead = 0,
NewMinorEvents = 1,
NewMessage = 2,
NewMentions = 3,
Invite = 4
};
unsigned short int unsigned short int
RoomInfoListItem::calculateImportance() const RoomInfoListItem::calculateImportance() const
{ {
@ -332,8 +341,17 @@ RoomInfoListItem::calculateImportance() const
// 2: Contains unread messages // 2: Contains unread messages
// 3: Contains mentions // 3: Contains mentions
// 4: Is a room invite // 4: Is a room invite
return (hasUnreadMessages_) + (unreadHighlightedMsgCount_ + unreadMsgCount_ != 0) + if (isInvite()) {
(unreadHighlightedMsgCount_ != 0) + (isInvite()) * 4; return Invite;
} else if (unreadHighlightedMsgCount_) {
return NewMentions;
} else if (unreadMsgCount_) {
return NewMessage;
} else if (hasUnreadMessages_) {
return NewMinorEvents;
} else {
return AllEventsRead;
}
} }
void void