Changeset 3498

Timestamp:

12/28/06 16:18:57 (2 years ago)

Author:

timothy

Message:

Greatly improved the Buddy List to quickly report users and work after reconnecting.

Files:

• trunk/Chat Core.exp (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.m (modified) (4 diffs)
• trunk/Chat Core/MVChatConnectionPrivate.h (modified) (1 diff)
• trunk/Chat Core/MVChatUser.h (modified) (2 diffs)
• trunk/Chat Core/MVChatUser.m (modified) (3 diffs)
• trunk/Chat Core/MVChatUserPrivate.h (modified) (1 diff)
• trunk/Chat Core/MVChatUserWatchRule.h (modified) (2 diffs)
• trunk/Chat Core/MVChatUserWatchRule.m (modified) (5 diffs)
• trunk/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (27 diffs)
• trunk/Models/JVBuddy.m (modified) (8 diffs)

trunk/Chat Core.exp

@@ -80 +80 @@
-_MVChatUserAttributeUpdatedNotification
-_MVChatUserWatchRuleMatchedNotification
+_MVChatUserWatchRuleRemovedMatchedUserNotification
-_MVDownloadFileTransferOfferNotification
-_MVFileTransferStartedNotification

trunk/Chat Core/MVChatConnection.h

@@ -72 +72 @@
-extern NSString *MVChatConnectionSelfAwayStatusChangedNotification;
-
-extern NSString *MVChatConnectionWatchedUserOnlineNotification;
-extern NSString *MVChatConnectionWatchedUserOfflineNotification;
-
-extern NSString *MVChatConnectionNicknameAcceptedNotification;
-extern NSString *MVChatConnectionNicknameRejectedNotification;

trunk/Chat Core/MVChatConnection.m

@@ -671 +671 @@
-- (void) addChatUserWatchRule:(MVChatUserWatchRule *) rule {
-        NSParameterAssert( rule != nil );
+
-        if( ! _chatUserWatchRules )
-                _chatUserWatchRules = [[NSMutableSet allocWithZone:nil] initWithCapacity:10];
+
-        @synchronized( _chatUserWatchRules ) {
-                if( ! [_chatUserWatchRules containsObject:rule] )
@@ -681 +683 @@
-- (void) removeChatUserWatchRule:(MVChatUserWatchRule *) rule {
-        NSParameterAssert( rule != nil );
+
+        [rule removeMatchedUsersForConnection:self];
+
-        @synchronized( _chatUserWatchRules ) {
-                [_chatUserWatchRules removeObject:rule];
@@ -919 +924 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [user retain]; // retain since removeMatchedUser might hold the last reference
-
@@ -952 +950 @@
-                }
-
-[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionWatchedUserOfflineNotification object:user userInfo:nil
+user _setStatus:MVChatUserOfflineStatus
-
-                [user release];

trunk/Chat Core/MVChatConnectionPrivate.h

@@ -21 +21 @@
-
-- (unsigned int) _watchRulesMatchingUser:(MVChatUser *) user;
-sendPossibleOnlineNotificationForUser
-sendPossibleOfflineNotificationForUser
+markUserAsOnline
+markUserAsOffline
-@end

trunk/Chat Core/MVChatUser.h

@@ -76 +76 @@
-        BOOL _identified : 1;
-        BOOL _serverOperator : 1;
-        BOOL _watched : 1;
-        BOOL _onlineNotificationSent : 1;
-}
@@ -161 +160 @@
-- (BOOL) isIdentified;
-- (BOOL) isServerOperator;
-- (BOOL) isWatched;
-
-- (BOOL) isEqual:(id) object;

trunk/Chat Core/MVChatUser.m

@@ -165 +165 @@
-@property(readonly, getter=isIdentified) BOOL identified;
-@property(readonly, getter=isServerOperator) BOOL serverOperator;
-@property(readonly, getter=isWatched) BOOL watched;
-#endif
-
@@ -174 +173 @@
-- (BOOL) isServerOperator {
-        return _serverOperator;
-}
-
-- (BOOL) isWatched {
-        return _watched;
-}
-
@@ -510 +505 @@
-}
-
-- (void) _setWatched:(BOOL) isWatched {
-        _watched = isWatched;
-}
-
-- (void) _setIdleTime:(NSTimeInterval) time {
-        _idleTime = time;

trunk/Chat Core/MVChatUserPrivate.h

@@ -12 +12 @@
-- (void) _setServerOperator:(BOOL) operator;
-- (void) _setIdentified:(BOOL) identified;
-- (void) _setWatched:(BOOL) watched;
-- (void) _setIdleTime:(NSTimeInterval) time;
-- (void) _setStatus:(MVChatUserStatus) status;

trunk/Chat Core/MVChatUserWatchRule.h

@@ -1 +1 @@
-@class MVChatUser;
+@class MVChatConnection;
-@class AGRegex;
-
-extern NSString *MVChatUserWatchRuleMatchedNotification;
+extern NSString *MVChatUserWatchRuleRemovedMatchedUserNotification;
-
-@interface MVChatUserWatchRule : NSObject <NSCopying> {
@@ -25 +27 @@
-- (BOOL) matchChatUser:(MVChatUser *) user;
-- (void) removeMatchedUser:(MVChatUser *) user;
+- (void) removeMatchedUsersForConnection:(MVChatConnection *) connection;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

trunk/Chat Core/MVChatUserWatchRule.m

@@ -7 +7 @@
-
-NSString *MVChatUserWatchRuleMatchedNotification = @"MVChatUserWatchRuleMatchedNotification";
+NSString *MVChatUserWatchRuleRemovedMatchedUserNotification = @"MVChatUserWatchRuleRemovedMatchedUserNotification";
-
-@implementation MVChatUserWatchRule
@@ -23 +24 @@
-}
-
+- (void) dealloc {
+        [_matchedChatUsers release];
+        [_nickname release];
+        [_nicknameRegex release];
+        [_realName release];
+        [_realNameRegex release];
+        [_username release];
+        [_usernameRegex release];
+        [_address release];
+        [_addressRegex release];
+        [_publicKey release];
+        [_applicableServerDomains release];
+
+        _matchedChatUsers = nil;
+        _nickname = nil;
+        _nicknameRegex = nil;
+        _realName = nil;
+        _realNameRegex = nil;
+        _username = nil;
+        _usernameRegex = nil;
+        _address = nil;
+        _addressRegex = nil;
+        _publicKey = nil;
+        _applicableServerDomains = nil;
+
+        [super dealloc];
+}
+
-- (id) copyWithZone:(NSZone *) zone {
-        MVChatUserWatchRule *copy = [[MVChatUserWatchRule allocWithZone:zone] init];
@@ -78 +107 @@
-        if( ! user ) return NO;
-
+        if( ! _matchedChatUsers )
+                _matchedChatUsers = [[NSMutableSet allocWithZone:nil] initWithCapacity:10];
+
-        @synchronized( _matchedChatUsers ) {
-                if( [_matchedChatUsers containsObject:user] )
@@ -108 +140 @@
-        @synchronized( _matchedChatUsers ) {
-                if( ! [_matchedChatUsers containsObject:user] ) {
-                        [user _setWatched:YES];
-                        [_matchedChatUsers addObject:user];
-                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatUserWatchRuleMatchedNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:user, @"user", nil]];
@@ -125 +156 @@
-- (void) removeMatchedUser:(MVChatUser *) user {
-        @synchronized( _matchedChatUsers ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}

trunk/Chat Core/MVIRCChatConnection.h

@@ -16 +16 @@
-        NSMutableArray *_sendQueue;
-        NSMutableDictionary *_knownUsers;
-        NSMutableSet *_matchedUsers;
-        NSMutableSet *_pendingWhoisUsers;
-        NSMutableSet *_fileTransfers;

trunk/Chat Core/MVIRCChatConnection.m

@@ -139 +139 @@
-        [_queueWait release];
-        [_lastCommand release];
-        [_matchedUsers release];
-        [_pendingWhoisUsers release];
-        [_roomPrefixes release];
@@ -163 +162 @@
-        _queueWait = nil;
-        _lastCommand = nil;
-        _matchedUsers = nil;
-        _pendingWhoisUsers = nil;
-        _roomPrefixes = nil;
@@ -482 +480 @@
-                        if( _watchCommandSupported ) [self sendRawMessageWithFormat:@"WATCH +%@", [rule nickname]];
-                        else [self sendRawMessageWithFormat:@"ISON %@", [rule nickname]];
+                }
+        } else {
+                @synchronized( _knownUsers ) {
+                        NSEnumerator *enumerator = [_knownUsers objectEnumerator];
+                        MVChatUser *user = nil;
+                        while( ( user = [enumerator nextObject] ) )
+                                [rule matchChatUser:user];
-                }
-        }
@@ -686 +691 @@
-        [old release];
-
-        old = _matchedUsers;
-        _matchedUsers = nil;
-        [old release];
-
-        old = _pendingWhoisUsers;
-        _pendingWhoisUsers = nil;
@@ -708 +709 @@
-
-                [self performSelectorOnMainThread:@selector( _didDisconnect ) withObject:nil waitUntilDone:NO];
+        }
+
+        @synchronized( _knownUsers ) {
+                NSEnumerator *enumerator = [_knownUsers objectEnumerator];
+                MVChatUser *user = nil;
+
+                while( ( user = [enumerator nextObject] ) )
+                        [user _setStatus:MVChatUserUnknownStatus];
+        }
+
+        @synchronized( _chatUserWatchRules ) {
+                NSEnumerator *enumerator = [_chatUserWatchRules objectEnumerator];
+                MVChatUserWatchRule *rule = nil;
+                while( ( rule = [enumerator nextObject] ) )
+                        [rule removeMatchedUsersForConnection:self];
-        }
-}
@@ -1115 +1131 @@
-#pragma mark -
-
-- (unsigned int) _watchRulesMatchingUser:(MVChatUser *) user {
-        if( ! _matchedUsers )
-                _matchedUsers = [[NSMutableSet allocWithZone:nil] initWithCapacity:25];
-
-        unsigned int count = 0;
-        @synchronized( _chatUserWatchRules ) {
-                NSEnumerator *enumerator = [_chatUserWatchRules objectEnumerator];
-                MVChatUserWatchRule *rule = nil;
-                while( ( rule = [enumerator nextObject] ) ) {
-                        if( [rule matchChatUser:user] ) {
-                                count++;
-                                @synchronized( _matchedUsers ) {
-                                        [_matchedUsers addObject:user];
-                                }
-                        }
-                }
-        }
-
-        return count;
-}
-
-- (void) _sendPossibleOfflineNotificationForUser:(MVChatUser *) user {
-        @synchronized( _matchedUsers ) {
-                if( [user isWatched] ) [_matchedUsers removeObject:user];
-        }
-
-        [super _sendPossibleOfflineNotificationForUser:user];
-}
-
-- (void) _scheduleWhoisForUser:(MVChatUser *) user {
-        if( ! _pendingWhoisUsers )
@@ -1162 +1149 @@
-        [self performSelector:@selector( _whoisWatchedUsers ) withObject:nil afterDelay:JVWatchedUserWHOISDelay];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1179 +1172 @@
-        if( [_lastSentIsonNicknames count] ) return; // there is already pending ISON requests, skip this round to catch up
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-
@@ -1192 +1188 @@
-
-        [_lastSentIsonNicknames release];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -1222 +1216 @@
-                while( ( rule = [enumerator nextObject] ) ) {
-                        NSString *nick = [rule nickname];
-            if( nick
+                       if( [nick length]
-                                if( ( [nick length] + [request length] ) > 510 ) {
-                                        [self sendRawMessage:request];
@@ -1454 +1448 @@
-                BOOL ctcp = ( *bytes == '\001' && [msgData length] > 2 );
-
-                if( [sender status] != MVChatUserAwayStatus )
-                        [sender _setStatus:MVChatUserAvailableStatus];
-                [sender _setIdleTime:0.];
+                [self _markUserAsOnline:sender];
-
-                if( [[self chatRoomNamePrefixes] characterIsMember:[targetName characterAtIndex:0]] ) {
@@ -1757 +1750 @@
-                        [room _clearBannedUsers];
-                } else {
-                        if( [sender status] != MVChatUserAwayStatus )
-                                [sender _setStatus:MVChatUserAvailableStatus];
-                        [sender _setIdleTime:0.];
+                        [self _markUserAsOnline:sender];
-                        [room _addMemberUser:sender];
-                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomUserJoinedNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", nil]];
-                        [self _sendPossibleOnlineNotificationForUser:sender];
-                }
-        }
@@ -1788 +1779 @@
-                if( [sender isLocalUser] ) return;
-
-nder _setDateDisconnected:[NSDate date]
-sender _setStatus:MVChatUserOfflineStatus
+lf _markUserAsOffline:sender
+_pendingWhoisUsers removeObject:sender
-
-                NSData *reason = [parameters objectAtIndex:0];
@@ -1804 +1795 @@
-
-                [info release];
-
-                [self _sendPossibleOfflineNotificationForUser:sender];
-
-                [_pendingWhoisUsers removeObject:sender];
-        }
-}
@@ -2007 +1994 @@
-- (void) _handlePingWithParameters:(NSArray *) parameters fromSender:(id) sender {
-        if( [parameters count] >= 1 ) {
-
+
+
-                else [self sendRawMessageImmediatelyWithComponents:@"PONG ", [parameters objectAtIndex:1], @" :", [parameters objectAtIndex:0], nil];
-
+
+
+
-        }
-}
@@ -2021 +2011 @@
-        if( [parameters count] == 2 && [sender isKindOfClass:[MVChatUser class]] ) {
-                NSString *roomName = [self _stringFromPossibleData:[parameters objectAtIndex:1]];
+                [self _markUserAsOnline:sender];
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomInvitedNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", roomName, @"room", nil]];
-                [self _sendPossibleOnlineNotificationForUser:sender];
-        }
-}
@@ -2032 +2022 @@
-                NSString *oldIdentifier = [[sender uniqueIdentifier] retain];
-
-                if( [sender status] != MVChatUserAwayStatus )
-                        [sender _setStatus:MVChatUserAvailableStatus];
-                [sender _setIdleTime:0.];
+                [self _markUserAsOnline:sender];
-
-                NSNotification *note = nil;
@@ -2059 +2048 @@
-                [oldNickname release];
-                [oldIdentifier release];
-
-                [self _sendPossibleOnlineNotificationForUser:sender];
-        }
-}
@@ -2080 +2067 @@
-                                if( [[user dateUpdated] timeIntervalSinceNow] < -JVWatchedUserWHOISDelay || ! [user dateUpdated] )
-                                        [self _scheduleWhoisForUser:user];
-
-
+
-                                [_lastSentIsonNicknames removeObject:nick];
-                        }
@@ -2090 +2076 @@
-                        while( ( nick = [enumerator nextObject] ) ) {
-                                MVChatUser *user = [self chatUserWithUniqueIdentifier:nick];
-sendPossibleOfflineNotificationForUser
+markUserAsOffline
-                        }
-
@@ -2157 +2143 @@
-                                [room _addMemberUser:member];
-                                [room _setModes:modes forMemberUser:member];
+
+                                [self _markUserAsOnline:member];
-                        }
-
@@ -2211 +2199 @@
-                }
-
-sendPossibleOnlineNotificationForUser
+markUserAsOnline
-        }
-}
@@ -2294 +2282 @@
-        if( [parameters count] == 6 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-                [user _setServerOperator:NO]; // set these to NO now so we get the true values later in the WHOIS
-                [user _setUsername:[parameters objectAtIndex:2]];
-                [user _setAddress:[parameters objectAtIndex:3]];
-                [user _setRealName:[self _stringFromPossibleData:[parameters objectAtIndex:5]]];
-DateDisconnected:nil];
-AwayStatusMessage:nil]; // set this to nil, we will get it if we get a 301
-
-sendPossibleOnlineNotificationForUser
+AwayStatusMessage:nil]; // set this to nil, we will get it if we get a RPL_AWAY
+ServerOperator:NO]; // set this to NO now so we get the true values later in the RPL_WHOISOPERATOR
+
+markUserAsOnline
-        }
-}
@@ -2339 +2326 @@
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-                [user _setDateUpdated:[NSDate date]];
-
-                if( [user status] != MVChatUserAwayStatus )
-                        [user _setStatus:MVChatUserAvailableStatus];
-
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatUserInformationUpdatedNotification object:user userInfo:nil];
@@ -2398 +2382 @@
-        if( [parameters count] >= 2 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-sendPossibleOfflineNotificationForUser
+markUserAsOffline
-                if( [_pendingWhoisUsers containsObject:user] ) {
-                        [_pendingWhoisUsers removeObject:user];
@@ -2410 +2394 @@
-        if( [parameters count] >= 2 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-sendPossibleOfflineNotificationForUser
+markUserAsOffline
-                if( [_pendingWhoisUsers containsObject:user] ) {
-                        [_pendingWhoisUsers removeObject:user];
@@ -2438 +2422 @@
-                [user _setUsername:[parameters objectAtIndex:2]];
-                [user _setAddress:[parameters objectAtIndex:3]];
-
-
-
+
+
-
-                if( [[user dateUpdated] timeIntervalSinceNow] < -JVWatchedUserWHOISDelay || ! [user dateUpdated] )

trunk/Models/JVBuddy.m

@@ -227 +227 @@
-        while( ( rule = [enumerator nextObject] ) )
-                [connection removeChatUserWatchRule:rule];
+
+        enumerator = [[[_users copy] autorelease] objectEnumerator];
+        MVChatUser *user = nil;
+
+        while( ( user = [enumerator nextObject] ) )
+                if( [[user connection] isEqual:connection] )
+                        [_users removeObject:user];
+
+        if( [[[self activeUser] connection] isEqual:connection] )
+                [self setActiveUser:[_users anyObject]];
-}
-
@@ -240 +250 @@
-                        [connection removeChatUserWatchRule:rule];
-        }
+
+        [_users removeAllObjects];
+        [self setActiveUser:nil];
-}
-
@@ -321 +334 @@
-        if( [_rules containsObject:rule] ) return;
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _ruleMatched: ) name:MVChatUserWatchRuleMatchedNotification object:rule];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _ruleUserRemoved: ) name:MVChatUserWatchRuleRemovedMatchedUserNotification object:rule];
-        [_rules addObject:rule];
-}
@@ -327 +341 @@
-        if( ! [_rules containsObject:rule] ) return;
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserWatchRuleMatchedNotification object:rule];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserWatchRuleRemovedMatchedUserNotification object:rule];
-        [_rules removeObject:rule];
-}
@@ -545 +560 @@
-
-@implementation JVBuddy (JVBuddyPrivate)
-
-
-
+
+
+
+
+
-        [_users addObject:user];
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        [_users removeObject:user];
-
@@ -561 +583 @@
-                [self setActiveUser:[_users anyObject]];
-
-
+
+
-}
-
@@ -572 +595 @@
-- (void) _buddyStatusChanged:(NSNotification *) notification {
-        MVChatUser *user = [notification object];
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -600 +634 @@
-        MVChatUser *user = [[notification userInfo] objectForKey:@"user"];
-
-
-
+
+
+
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyIdleUpdate: ) name:MVChatUserIdleTimeUpdatedNotification object:user];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyStatusChanged: ) name:MVChatUserStatusChangedNotification object:user];
+}
+
+- (void) _ruleUserRemoved:(NSNotification *) notification {
+        MVChatUser *user = [[notification userInfo] objectForKey:@"user"];
+
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserIdleTimeUpdatedNotification object:user];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:MVChatUserStatusChangedNotification object:user];
+
+        [self _removeUser:user];
-}
-@end