Skip to content
Snippets Groups Projects
Unverified Commit a5b388db authored by Emi Simpson's avatar Emi Simpson
Browse files

Appease the linter

parent 389117f1
No related branches found
No related tags found
No related merge requests found
......@@ -332,10 +332,8 @@ RoomInfoListItem::calculateImportance() const
// 2: Contains unread messages
// 3: Contains mentions
// 4: Is a room invite
return (hasUnreadMessages_) +
(unreadHighlightedMsgCount_ + unreadMsgCount_ != 0) +
(unreadHighlightedMsgCount_ != 0) +
(isInvite()) * 4;
return (hasUnreadMessages_) + (unreadHighlightedMsgCount_ + unreadMsgCount_ != 0) +
(unreadHighlightedMsgCount_ != 0) + (isInvite()) * 4;
}
void
......
......@@ -331,8 +331,10 @@ RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info)
emit sortRoomsByLastMessage();
}
struct room_sort {
bool operator() (const RoomInfoListItem * a, const RoomInfoListItem * b) const {
struct room_sort
{
bool operator()(const RoomInfoListItem *a, const RoomInfoListItem *b) const
{
// Sort by "importance" (i.e. invites before mentions before
// notifs before new events before old events), then secondly
// by recency.
......@@ -340,16 +342,18 @@ struct room_sort {
// Checking importance first
const auto a_importance = a->calculateImportance();
const auto b_importance = b->calculateImportance();
if(a_importance != b_importance) {
if (a_importance != b_importance) {
return a_importance > b_importance;
}
// Now sort by recency
// Zero if empty, otherwise the time that the event occured
const uint64_t a_recency = a->lastMessageInfo().userid.isEmpty() ? 0 :
a->lastMessageInfo().datetime.toMSecsSinceEpoch();
const uint64_t b_recency = b->lastMessageInfo().userid.isEmpty() ? 0 :
b->lastMessageInfo().datetime.toMSecsSinceEpoch();
const uint64_t a_recency = a->lastMessageInfo().userid.isEmpty()
? 0
: a->lastMessageInfo().datetime.toMSecsSinceEpoch();
const uint64_t b_recency = b->lastMessageInfo().userid.isEmpty()
? 0
: b->lastMessageInfo().datetime.toMSecsSinceEpoch();
return a_recency > b_recency;
}
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment