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

View file

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