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

Appease the linter

This commit is contained in:
Emi Simpson 2020-03-14 09:16:08 -04:00
parent 389117f1e8
commit a5b388db15
No known key found for this signature in database
GPG Key ID: 68FAB2E2E6DFC98B
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/RoomInfoListItem.cpp
View File

@ -332,10 +332,8 @@ 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_) + return (hasUnreadMessages_) + (unreadHighlightedMsgCount_ + unreadMsgCount_ != 0) +
(unreadHighlightedMsgCount_ + unreadMsgCount_ != 0) + (unreadHighlightedMsgCount_ != 0) + (isInvite()) * 4;
(unreadHighlightedMsgCount_ != 0) +
(isInvite()) * 4;
} }
void void

18
src/RoomList.cpp
View File

@ -331,8 +331,10 @@ RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info)
emit sortRoomsByLastMessage(); emit sortRoomsByLastMessage();
} }
struct room_sort { struct room_sort
bool operator() (const RoomInfoListItem * a, const RoomInfoListItem * b) const { {
bool operator()(const RoomInfoListItem *a, const RoomInfoListItem *b) const
{
// Sort by "importance" (i.e. invites before mentions before // Sort by "importance" (i.e. invites before mentions before
// notifs before new events before old events), then secondly // notifs before new events before old events), then secondly
// by recency. // by recency.
@ -340,16 +342,18 @@ struct room_sort {
// Checking importance first // Checking importance first
const auto a_importance = a->calculateImportance(); const auto a_importance = a->calculateImportance();
const auto b_importance = b->calculateImportance(); const auto b_importance = b->calculateImportance();
if(a_importance != b_importance) { if (a_importance != b_importance) {
return a_importance > b_importance; return a_importance > b_importance;
} }
// Now sort by recency // Now sort by recency
// Zero if empty, otherwise the time that the event occured // Zero if empty, otherwise the time that the event occured
const uint64_t a_recency = a->lastMessageInfo().userid.isEmpty() ? 0 : const uint64_t a_recency = a->lastMessageInfo().userid.isEmpty()
a->lastMessageInfo().datetime.toMSecsSinceEpoch(); ? 0
const uint64_t b_recency = b->lastMessageInfo().userid.isEmpty() ? 0 : : a->lastMessageInfo().datetime.toMSecsSinceEpoch();
b->lastMessageInfo().datetime.toMSecsSinceEpoch(); const uint64_t b_recency = b->lastMessageInfo().userid.isEmpty()
? 0
: b->lastMessageInfo().datetime.toMSecsSinceEpoch();
return a_recency > b_recency; return a_recency > b_recency;
} }
}; };