sort nick suggestions by last highlight, last spoken, then alphabetical

Author: c99koder

IRCCloud/Classes/MainViewController.m

@@ -1465,10 +1465,6 @@ - (void)handleEvent:(NSNotification *)notification {
             if(e.bid == self->_buffer.bid) {
                 if(e.isHighlight) {
                     [self showMentionTip];
-                    User *u = [[UsersDataSource sharedInstance] getUser:e.from cid:e.cid bid:e.bid];
-                    if(u && u.lastMention < e.eid) {
-                        u.lastMention = e.eid;
-                    }
                 }
                 if(!e.isSelf && !_buffer.scrolledUp && !self.view.accessibilityElementsHidden) {
                     [[NSOperationQueue mainQueue] addOperationWithBlock:^{

IRCCloud/Classes/NetworkConnection.m

@@ -381,16 +381,29 @@ -(id)init {
                 if((!backlog || self->_resuming || [[self->_oobQueue firstObject] bid] == -1) && event.eid > self->_highestEID) {
                     self->_highestEID = event.eid;
                 }
-                if(event.eid > b.last_seen_eid && [event isImportant:b.type] && (event.isHighlight || [b.type isEqualToString:@"conversation"])) {
-                    BOOL show = YES;
-                    if([[self->_servers getServer:event.cid].ignore match:event.ignoreMask] || [[[[self prefs] objectForKey:@"buffer-disableTrackUnread"] objectForKey:@(b.bid)] integerValue]) {
-                        show = NO;
+                if([event isImportant:b.type]) {
+                    User *u = [self->_users getUser:event.from cid:event.cid bid:event.bid];
+                    if(u) {
+                        if(u.lastMessage < event.eid) {
+                            u.lastMessage = event.eid;
+                        }
+                        if(event.isHighlight) {
+                            if(u.lastMention < event.eid) {
+                                u.lastMention = event.eid;
+                            }
+                        }
                     }
-                    
-                    if(show && ![self->_notifications getNotification:event.eid bid:event.bid]) {
-                        [self->_notifications notify:[NSString stringWithFormat:@"<%@> %@",event.from,event.msg] category:event.type cid:event.cid bid:event.bid eid:event.eid];
-                        if(!backlog)
-                            [self->_notifications updateBadgeCount];
+                    if(event.eid > b.last_seen_eid && (event.isHighlight || [b.type isEqualToString:@"conversation"])) {
+                        BOOL show = YES;
+                        if([[self->_servers getServer:event.cid].ignore match:event.ignoreMask] || [[[[self prefs] objectForKey:@"buffer-disableTrackUnread"] objectForKey:@(b.bid)] integerValue]) {
+                            show = NO;
+                        }
+                        
+                        if(show && ![self->_notifications getNotification:event.eid bid:event.bid]) {
+                            [self->_notifications notify:[NSString stringWithFormat:@"<%@> %@",event.from,event.msg] category:event.type cid:event.cid bid:event.bid eid:event.eid];
+                            if(!backlog)
+                                [self->_notifications updateBadgeCount];
+                        }
                     }
                 }
                 if((!backlog && !self->_resuming) || event.reqId > 0) {

IRCCloud/Classes/UsersDataSource.h

@@ -29,13 +29,14 @@
     int _away;
     NSString *_away_msg;
     NSTimeInterval _lastMention;
+    NSTimeInterval _lastMessage;
     NSString *_ircserver;
     BOOL _parted;
 }
 @property int cid, bid, away;
 @property NSString *nick, *old_nick, *hostmask, *mode, *away_msg, *ircserver, *display_name;
 @property (readonly) NSString *lowercase_nick;
-@property NSTimeInterval lastMention;
+@property NSTimeInterval lastMention, lastMessage;
 @property BOOL parted;
 -(NSComparisonResult)compare:(User *)aUser;
 -(NSComparisonResult)compareByMentionTime:(User *)aUser;

IRCCloud/Classes/UsersDataSource.m

@@ -55,12 +55,17 @@ -(NSComparisonResult)compare:(User *)aUser {
 }
 
 -(NSComparisonResult)compareByMentionTime:(User *)aUser {
-    if(self->_lastMention == aUser.lastMention)
-        return [self->_lowercase_nick localizedStandardCompare:aUser.lowercase_nick];
-    else if(self->_lastMention > aUser.lastMention)
+    if(self->_lastMention < aUser.lastMention) {
+        return NSOrderedDescending;
+    } else if(self->_lastMention > aUser.lastMention) {
         return NSOrderedAscending;
-    else
+    } else if(self->_lastMessage < aUser.lastMessage) {
         return NSOrderedDescending;
+    } else if(self->_lastMessage > aUser.lastMessage) {
+        return NSOrderedAscending;
+    } else {
+        return [self->_lowercase_nick localizedStandardCompare:aUser.lowercase_nick];
+    }
 }
 
 -(id)initWithCoder:(NSCoder *)aDecoder {