Changeset 3190

Timestamp:

04/02/06 05:32:29 (2 years ago)

Author:

timothy

Message:

More work on the new buddy list.

Files:

• trunk/Chat Core.exp (modified) (2 diffs)
• trunk/Chat Core.xcodeproj/project.pbxproj (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.m (modified) (1 diff)
• trunk/Chat Core/MVChatUser.h (modified) (1 diff)
• trunk/Chat Core/MVChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVChatUserWatchRule.h (modified) (2 diffs)
• trunk/Chat Core/MVChatUserWatchRule.m (modified) (5 diffs)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (2 diffs)
• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (2 diffs)
• trunk/Controllers/MVBuddyListController.m (modified) (3 diffs)
• trunk/Controllers/MVConnectionsController.m (modified) (2 diffs)
• trunk/Models/JVBuddy.h (modified) (4 diffs)
• trunk/Models/JVBuddy.m (modified) (11 diffs)

trunk/Chat Core.exp

@@ -2 +2 @@
-.objc_class_name_MVChatRoom
-.objc_class_name_MVChatUser
+.objc_class_name_MVChatUserWatchRule
-.objc_class_name_MVFileTransfer
-.objc_class_name_MVDownloadFileTransfer
@@ -67 +68 @@
-_MVChatUserInformationUpdatedNotification
-_MVChatUserAttributeUpdatedNotification
+_MVChatUserWatchRuleMatchedNotification
-_MVDownloadFileTransferOfferNotification
-_MVFileTransferStartedNotification

trunk/Chat Core.xcodeproj/project.pbxproj

@@ -31 +31 @@
-                1C7C776907DBBA4500FB5F83 /* NSScriptCommandAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C7C776707DBBA4500FB5F83 /* NSScriptCommandAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1C7C776A07DBBA4500FB5F83 /* NSScriptCommandAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C7C776807DBBA4500FB5F83 /* NSScriptCommandAdditions.m */; };
-
+settings = {ATTRIBUTES = (Public, ); }; 
-                1C8AAEFF09D69F2700CF29EB /* MVChatUserWatchRule.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C8AAEFD09D69F2700CF29EB /* MVChatUserWatchRule.m */; };
-                1C8AAF2B09D6A0A100CF29EB /* AGRegex.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C8AAF2609D6A0A100CF29EB /* AGRegex.framework */; };

trunk/Chat Core/MVChatConnection.h

@@ -252 +252 @@
-#pragma mark -
-
-- (void) startWatchingUser:(MVChatUser *) user;
-- (void) stopWatchingUser:(MVChatUser *) user;
-
-#pragma mark -
-
-- (void) addChatUserWatchRule:(MVChatUserWatchRule *) rule;
-- (void) removeChatUserWatchRule:(MVChatUserWatchRule *) rule;

trunk/Chat Core/MVChatConnection.m

@@ -666 +666 @@
-#pragma mark -
-
-- (void) startWatchingUser:(MVChatUser *) user {
-// subclass this method, if needed
-}
-
-- (void) stopWatchingUser:(MVChatUser *) user {
-// subclass this method, if needed
-}
-
-- (void) addChatUserWatchRule:(MVChatUserWatchRule *) rule {
+        NSParameterAssert( rule != nil );
-        if( ! _chatUserWatchRules )
-                _chatUserWatchRules = [[NSMutableSet allocWithZone:nil] initWithCapacity:10];
-        @synchronized( _chatUserWatchRules ) {
-
+
+
-        }
-}
-
-- (void) removeChatUserWatchRule:(MVChatUserWatchRule *) rule {
+        NSParameterAssert( rule != nil );
-        @synchronized( _chatUserWatchRules ) {
-                [_chatUserWatchRules removeObject:rule];

trunk/Chat Core/MVChatUser.h

@@ -125 +125 @@
-- (unsigned long) modes;
-
-- (void) startWatching;
-- (void) stopWatching;
-
-- (void) refreshInformation;
-

trunk/Chat Core/MVChatUser.m

@@ -363 +363 @@
-#pragma mark -
-
-- (void) startWatching {
-        [[self connection] startWatchingUser:self];
-}
-
-- (void) stopWatching {
-        [[self connection] stopWatchingUser:self];
-}
-
-#pragma mark -
-
-- (void) refreshInformation {
-// subclass this method, if needed

trunk/Chat Core/MVChatUserWatchRule.h

@@ -15 +15 @@
-        AGRegex *_addressRegex;
-        NSData *_publicKey;
+        NSArray *_applicableServerDomains;
-        BOOL _interim;
-}
@@ -47 +48 @@
-- (BOOL) isInterim;
-- (void) setInterim:(BOOL) interim;
+
+- (NSArray *) applicableServerDomains;
+- (void) setApplicableServerDomains:(NSArray *) serverDomains;
-@end

trunk/Chat Core/MVChatUserWatchRule.m

@@ -17 +17 @@
-                [self setPublicKey:[dictionary objectForKey:@"publicKey"]];
-                [self setInterim:[[dictionary objectForKey:@"interim"] boolValue]];
+                [self setApplicableServerDomains:[dictionary objectForKey:@"applicableServerDomains"]];
-        }
-
@@ -30 +31 @@
-        [self setPublicKey:[self publicKey]];
-        [self setInterim:[self isInterim]];
+        [self setApplicableServerDomains:[self applicableServerDomains]];
-        return copy;
-}
@@ -41 +43 @@
-        if( _publicKey ) [dictionary setObject:_nickname forKey:@"publicKey"];
-        if( _interim ) [dictionary setObject:[NSNumber numberWithBool:_interim] forKey:@"interim"];
+        if( _applicableServerDomains ) [dictionary setObject:_applicableServerDomains forKey:@"applicableServerDomains"];
-        return [dictionary autorelease];
-}
@@ -81 +84 @@
-
-        NSString *string = [user nickname];
-
-
+
+
+
-
-        string = [user username];
-
-
+
+
+
-
-        string = [user address];
-
-
+
+
+
-
-        string = [user realName];
-
-
+
+
+
-
-        NSData *data = [user publicKey];
-data && 
+
-
-        @synchronized( _matchedChatUsers ) {
@@ -213 +220 @@
-        _interim = interim;
-}
+
+- (NSArray *) applicableServerDomains {
+        return [[_applicableServerDomains retain] autorelease];
+}
+
+- (void) setApplicableServerDomains:(NSArray *) serverDomains {
+        id old = _applicableServerDomains;
+        _applicableServerDomains = [serverDomains copyWithZone:nil];
+        [old release];
+}
-@end

trunk/Chat Core/MVIRCChatConnection.m

@@ -424 +424 @@
-#pragma mark -
-
-- (void) startWatchingUser:(MVChatUser *) user {
-        NSParameterAssert( user != nil );
-        NSParameterAssert( [[user nickname] length] > 0 );
-
-}
-
-- (void) stopWatchingUser:(MVChatUser *) user {
-        NSParameterAssert( user != nil );
-        NSParameterAssert( [[user nickname] length] > 0 );
-
-}
-
-- (void) addChatUserWatchRule:(MVChatUserWatchRule *) rule {
+        @synchronized( _chatUserWatchRules ) {
+                if( [_chatUserWatchRules containsObject:rule] ) return;
+        }
+
-        [super addChatUserWatchRule:rule];
-
-
-
-
+
+
+
+
+
+
+
-        }
-}
@@ -628 +624 @@
-
-        _isonSentCount = 0;
-
-        @synchronized( _knownUsers ) {
-                [_knownUsers removeAllObjects];
-        }
-
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _periodicCleanUp ) object:nil];

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -475 +475 @@
-                1C0A4CF40799BEA70093B702 /* JVViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JVViewCell.h; path = Views/JVViewCell.h; sourceTree = "<group>"; };
-                1C0A4CF50799BEA70093B702 /* JVViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JVViewCell.m; path = Views/JVViewCell.m; sourceTree = "<group>"; };
+                1C0B2F0809DF8A8B009952E7 /* MVChatUserWatchRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatUserWatchRule.h; path = "Chat Core/MVChatUserWatchRule.h"; sourceTree = "<group>"; };
-                1C18CD100528DBBA000001C8 /* NSColorAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSColorAdditions.h; path = Additions/NSColorAdditions.h; sourceTree = "<group>"; };
-                1C1ACE410533943900F71D4E /* JVInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JVInspectorController.h; path = Controllers/JVInspectorController.h; sourceTree = "<group>"; };
@@ -1654 +1655 @@
-                                1CDDCF830716208300FE11C3 /* MVChatRoom.h */,
-                                1CDDCF840716208300FE11C3 /* MVChatUser.h */,
+                                1C0B2F0809DF8A8B009952E7 /* MVChatUserWatchRule.h */,
-                                1C8CF8E1066530D60080A2F5 /* MVFileTransfer.h */,
-                                1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */,

trunk/Controllers/MVBuddyListController.m

@@ -233 +233 @@
-                [self showNewPersonSheet:nil];
-        } else {
-
-
+//
+//
-                [self _saveBuddyList];
-        }
@@ -338 +338 @@
-
-        if( person ) {
-
-
+//
+//
-                [self _saveBuddyList];
-        }
@@ -974 +974 @@
-
-- (void) _saveBuddyList {
-NSMutableArray array
+[NSMutableArray allocWithZone:nil] init
-        NSEnumerator *enumerator = [_buddyList objectEnumerator];
-        JVBuddy *buddy = nil;
-
-        while( ( buddy = [enumerator nextObject] ) )
-uniqueIdentifier
-
-[NSUserDefaults standardUserDefaults] setObject:list forKey:@"JVChatBuddies"
-[NSUserDefaults standardUserDefaults] synchroniz
+dictionaryRepresentation
+
+list writeToFile:[@"~/Library/Application Support/Colloquy/Buddy List.plist" stringByExpandingTildeInPath] atomically:YES
+list releas
-}
-
-- (void) _loadBuddyList {
-UserDefaults standardUserDefaults] objectForKey:@"JVChatBuddies"
+Array allocWithZone:nil] initWithContentsOfFile:[@"~/Library/Application Support/Colloquy/Buddy List.plist" stringByExpandingTildeInPath]
-        NSEnumerator *enumerator = [list objectEnumerator];
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-@end

trunk/Controllers/MVConnectionsController.m

@@ -559 +559 @@
-
-        while( ( info = [enumerator nextObject] ) ) {
-aseInsensitiveCompare:address
+ompare:address options:( NSCaseInsensitiveSearch | NSLiteralSearch | NSBackwardsSearch | NSAnchoredSearch )
-                        ret = [info objectForKey:@"connection"];
-                        if( [ret isConnected] ) return ret;
@@ -574 +574 @@
-
-        while( ( info = [enumerator nextObject] ) )
-aseInsensitiveCompare:address
+ompare:address options:( NSCaseInsensitiveSearch | NSLiteralSearch | NSBackwardsSearch | NSAnchoredSearch )
-                        [ret addObject:[info objectForKey:@"connection"]];
-

trunk/Models/JVBuddy.h

@@ -10 +10 @@
-
-@class ABPerson;
+@class MVChatUserWatchRule;
-
-extern NSString * const JVBuddyAddressBookIRCNicknameProperty;
@@ -22 +23 @@
-@interface JVBuddy : NSObject {
-        ABPerson *_person;
+        NSMutableArray *_rules;
-        NSMutableArray *_users;
-        NSMutableSet *_onlineUsers;
@@ -29 +31 @@
-+ (void) setPreferredName:(JVBuddyName) preferred;
-
-
-
-
-
+
+
-
-- (void) registerWithApplicableConnections;
@@ -55 +55 @@
-- (NSSet *) onlineUsers;
-
-
-
-
+
+
-
-- (NSImage *) picture;

trunk/Models/JVBuddy.m

@@ -1 +1 @@
-#import "JVBuddy.h"
+
+#import <ChatCore/MVChatUserWatchRule.h>
-#import "MVConnectionsController.h"
-
@@ -28 +30 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        if( ( self = [super init] ) ) {
-
-
-
-
-
-
-
+
-                _users = [[NSMutableArray allocWithZone:nil] initWithCapacity:5];
-                _onlineUsers = [[NSMutableSet allocWithZone:nil] initWithCapacity:5];
-                _activeUser = nil;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                }
+
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _registerWithConnection: ) name:MVChatConnectionDidConnectNotification object:nil];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _disconnected: ) name:MVChatConnectionDidDisconnectNotification object:nil];
-
-                [self registerWithApplicableConnections];
@@ -76 +62 @@
-
-        [_person release];
+        [_rules release];
-        [_users release];
-        [_onlineUsers release];
@@ -82 +69 @@
-        _person = nil;
-        _users = nil;
+        _rules = nil;
-        _onlineUsers = nil;
-        _activeUser = nil;
@@ -90 +78 @@
-#pragma mark -
-
+- (NSDictionary *) dictionaryRepresentation {
+        NSMutableDictionary *dictionary = [[NSMutableDictionary allocWithZone:nil] initWithCapacity:5];
+        [dictionary setObject:_rules forKey:@"rules"];
+        return dictionary;
+}
+
+#pragma mark -
+
-- (void) registerWithApplicableConnections {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
-
-- (void) unregisterWithApplicableConnections {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
@@ -123 +145 @@
-
-- (void) setActiveUser:(MVChatUser *) user {
-        if( [user isWildcardUser] ) {
-                NSEnumerator *enumerator = [_onlineUsers objectEnumerator];
-                MVChatUser *match = nil;
-
-                while( ( match = [enumerator nextObject] ) ) {
-                        if( [match isEqualToChatUser:user] ) {
-                                user = match;
-                                break;
-                        }
-                }
-        }
-
-        [_activeUser autorelease];
-        _activeUser = [user retain];
@@ -202 +212 @@
-#pragma mark -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -345 +319 @@
-
-- (void) editInAddressBook {
+        if( ! _person ) return;
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"addressbook://%@?edit", [_person uniqueId]]];
-        [[NSWorkspace sharedWorkspace] openURL:url];
@@ -350 +325 @@
-
-- (void) viewInAddressBook {
+        if( ! _person ) return;
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"addressbook://%@", [_person uniqueId]]];
-        [[NSWorkspace sharedWorkspace] openURL:url];
@@ -442 +418 @@
-- (void) _buddyOnline:(NSNotification *) notification {
-        MVChatUser *user = [notification object];
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
-- (void) _buddyOffline:(NSNotification *) notification {
-        MVChatUser *user = [notification object];
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:user];
-
-        [_onlineUsers removeObject:user];
@@ -486 +455 @@
-- (void) _registerWithConnection:(NSNotification *) notification {
-        MVChatConnection *connection = [notification object];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        MVChatUser *user = nil;
-
-        while( ( user = [enumerator nextObject] ) ) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        [_onlineUsers removeObject:user];
-                        if( ! [_onlineUsers count] ) [[NSNotificationCenter defaultCenter] postNotificationName:JVBuddyWentOfflineNotification object:self userInfo:nil];
-                }
-        }
+}
+
+- (void) _ruleMatched:(NSNotification *) notification {
+        MVChatUser *user = [[notification userInfo] objectForKey:@"user"];
+
+        [_users addObject:user];
+        if( ! [self activeUser] )
+                [self setActiveUser:user];
+
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyOnline: ) name:MVChatConnectionWatchedUserOfflineNotification object:user];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyOffline: ) name:MVChatConnectionWatchedUserOfflineNotification object:user];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyIdleUpdate: ) name:MVChatUserIdleTimeUpdatedNotification object:user];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _buddyStatusChanged: ) name:MVChatUserStatusChangedNotification object:user];
-}
-@end