rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Place invites on top of room list even when sorting by importance is off

This commit is contained in:
Emi Simpson 2020-03-15 16:28:32 -04:00
parent 78ac902549
commit d51cbe7e32
No known key found for this signature in database
GPG Key ID: 68FAB2E2E6DFC98B
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/RoomInfoListItem.cpp
View File

@ -333,10 +333,9 @@ enum NotificationImportance : short
{ {
ImportanceDisabled = -1, ImportanceDisabled = -1,
AllEventsRead = 0, AllEventsRead = 0,
NewMinorEvents = 1, // This is currently unused NewMessage = 1,
NewMessage = 2, NewMentions = 2,
NewMentions = 3, Invite = 3
Invite = 4
}; };
unsigned short int unsigned short int
@ -344,11 +343,11 @@ RoomInfoListItem::calculateImportance() const
{ {
// Returns the degree of importance of the unread messages in the room. // Returns the degree of importance of the unread messages in the room.
// If sorting by importance is disabled in settings, this only ever // If sorting by importance is disabled in settings, this only ever
// returns ImportanceDisabled // returns ImportanceDisabled or Invite
if (!settings->isSortByImportanceEnabled()) { if (isInvite()) {
return ImportanceDisabled;
} else if (isInvite()) {
return Invite; return Invite;
} else if (!settings->isSortByImportanceEnabled()) {
return ImportanceDisabled;
} else if (unreadHighlightedMsgCount_) { } else if (unreadHighlightedMsgCount_) {
return NewMentions; return NewMentions;
} else if (unreadMsgCount_) { } else if (unreadMsgCount_) {