Changeset 3081

Timestamp:

12/25/05 08:13:10 (3 years ago)

Author:

timothy

Message:

• More code clean up.
  
• Joining rooms works. The member list is populated and room status is shown.
  

Files:

• branches/cocoa-networking/Chat Core.xcodeproj/project.pbxproj (modified) (4 diffs)
• branches/cocoa-networking/Chat Core/MVChatConnectionPrivate.h (added)
• branches/cocoa-networking/Chat Core/MVChatRoom.m (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVChatRoomPrivate.h (added)
• branches/cocoa-networking/Chat Core/MVChatUserPrivate.h (added)
• branches/cocoa-networking/Chat Core/MVFileTransferPrivate.h (added)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.h (modified) (3 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (12 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatRoom.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatRoom.m (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVIRCChatUser.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCFileTransfer.h (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVSILCChatConnection.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVSILCChatRoom.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVSILCChatUser.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVSILCFileTransfer.h (modified) (2 diffs)

branches/cocoa-networking/Chat Core.xcodeproj/project.pbxproj

@@ -46 +46 @@
-                1CD020C0057593F9000F93B4 /* NSColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD020BD057593A9000F93B4 /* NSColorAdditions.m */; };
-                1CDDD9AD0718BD2E00FE11C3 /* MVChatRoom.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C5CC07A06FFCB0B0006C5B1 /* MVChatRoom.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                1CE4630F095ECCFE00AB7732 /* MVChatUserPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE4630E095ECCFE00AB7732 /* MVChatUserPrivate.h */; };
+                1CE4631E095ECD7300AB7732 /* MVChatRoomPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE4631D095ECD7300AB7732 /* MVChatRoomPrivate.h */; };
+                1CE4632F095ECDE600AB7732 /* MVFileTransferPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE4632E095ECDE600AB7732 /* MVFileTransferPrivate.h */; };
+                1CE4633C095ECE4F00AB7732 /* MVChatConnectionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE4633B095ECE4F00AB7732 /* MVChatConnectionPrivate.h */; };
-                1CEEB166095BE36700166A54 /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CEEB164095BE36700166A54 /* AsyncSocket.m */; };
-                1CEEB173095BE3A000166A54 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CEEB167095BE3A000166A54 /* CoreServices.framework */; };
@@ -319 +323 @@
-                1CD020BC057593A9000F93B4 /* NSColorAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSColorAdditions.h; path = Additions/NSColorAdditions.h; sourceTree = "<group>"; };
-                1CD020BD057593A9000F93B4 /* NSColorAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSColorAdditions.m; path = Additions/NSColorAdditions.m; sourceTree = "<group>"; };
+                1CE4630E095ECCFE00AB7732 /* MVChatUserPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatUserPrivate.h; path = "Chat Core/MVChatUserPrivate.h"; sourceTree = "<group>"; };
+                1CE4631D095ECD7300AB7732 /* MVChatRoomPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatRoomPrivate.h; path = "Chat Core/MVChatRoomPrivate.h"; sourceTree = "<group>"; };
+                1CE4632E095ECDE600AB7732 /* MVFileTransferPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVFileTransferPrivate.h; path = "Chat Core/MVFileTransferPrivate.h"; sourceTree = "<group>"; };
+                1CE4633B095ECE4F00AB7732 /* MVChatConnectionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatConnectionPrivate.h; path = "Chat Core/MVChatConnectionPrivate.h"; sourceTree = "<group>"; };
-                1CEEB163095BE36700166A54 /* AsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncSocket.h; path = "Chat Core/AsyncSocket.h"; sourceTree = "<group>"; };
-                1CEEB164095BE36700166A54 /* AsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AsyncSocket.m; path = "Chat Core/AsyncSocket.m"; sourceTree = "<group>"; };
@@ -716 +724 @@
-                                F52D043001873FC401EE70DE /* MVChatConnection.m */,
-                                F52D043101873FC401EE70DE /* MVChatConnection.h */,
+                                1CE4633B095ECE4F00AB7732 /* MVChatConnectionPrivate.h */,
-                                1C5CC07B06FFCB0B0006C5B1 /* MVChatRoom.m */,
-                                1C5CC07A06FFCB0B0006C5B1 /* MVChatRoom.h */,
+                                1CE4631D095ECD7300AB7732 /* MVChatRoomPrivate.h */,
-                                1C5CBF3406FF986E0006C5B1 /* MVChatUser.m */,
-                                1C5CBF3306FF986E0006C5B1 /* MVChatUser.h */,
+                                1CE4630E095ECCFE00AB7732 /* MVChatUserPrivate.h */,
-                                1C943AAA063C260800618CD9 /* MVFileTransfer.m */,
-                                1C943AA9063C260800618CD9 /* MVFileTransfer.h */,
+                                1CE4632E095ECDE600AB7732 /* MVFileTransferPrivate.h */,
-                                1C2EF7EC0427A40B00000102 /* MVChatPluginManager.m */,
-                                1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */,
@@ -788 +800 @@
-                                1C7C776907DBBA4500FB5F83 /* NSScriptCommandAdditions.h in Headers */,
-                                1C63E9ED086E59D700A40DD4 /* ChatCore.h in Headers */,
+                                1CE4630F095ECCFE00AB7732 /* MVChatUserPrivate.h in Headers */,
+                                1CE4631E095ECD7300AB7732 /* MVChatRoomPrivate.h in Headers */,
+                                1CE4632F095ECDE600AB7732 /* MVFileTransferPrivate.h in Headers */,
+                                1CE4633C095ECE4F00AB7732 /* MVChatConnectionPrivate.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

branches/cocoa-networking/Chat Core/MVChatRoom.m

@@ -533 +533 @@
-}
-
+- (void) _setModes:(unsigned long) modes forMemberUser:(MVChatUser *) user {
+        @synchronized( _memberModes ) {
+                [_memberModes setObject:[NSNumber numberWithUnsignedLong:modes] forKey:[user uniqueIdentifier]];
+        }       
+}
+
-- (void) _setMode:(MVChatRoomMemberMode) mode forMemberUser:(MVChatUser *) user {
-        @synchronized( _memberModes ) {

branches/cocoa-networking/Chat Core/MVIRCChatConnection.h

@@ -1 +1 @@
-#import "MVChatConnection.h"
+#import "MVChatConnectionPrivate.h"
-
-@class AsyncSocket;
@@ -27 +28 @@
-@interface MVChatConnection (MVIRCChatConnectionPrivate)
-- (void) _readNextMessageFromServer;
-- (void) _handleCommand:(id) command parameters:(NSArray *) parameters fromSender:(NSString *) sender username:(NSString *) user host:(NSString *) host;
-
-+ (NSData *) _flattenedIRCDataForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format;
@@ -36 +36 @@
-- (void) _updateKnownUser:(MVChatUser *) user withNewNickname:(NSString *) nickname;
-@end
-
-#pragma mark -
-
-@interface MVChatConnection (MVIRCChatConnectionPrivateSuper)
-- (void) _willConnect;
-- (void) _didConnect;
-- (void) _didNotConnect;
-- (void) _willDisconnect;
-- (void) _didDisconnect;
-- (void) _postError:(NSError *) error;
-- (void) _setStatus:(MVChatConnectionStatus) status;
-
-- (void) _addJoinedRoom:(MVChatRoom *) room;
-- (void) _removeJoinedRoom:(MVChatRoom *) room;
-@end

branches/cocoa-networking/Chat Core/MVIRCChatConnection.m

@@ -149 +149 @@
-#define ERR_LISTSYNTAX       521
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        MVIRCChatConnection *self = [MVIRCChatConnection _connectionForServer:(SERVER_REC *)server];
-        if( ! self ) return;
@@ -1130 +1079 @@
-                [self _didNotConnect];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-// Setup the proxy header with the most current connection address and port.
-        if( _proxy == MVChatConnectionHTTPSProxy || _proxy == MVChatConnectionHTTPProxy ) {
@@ -1160 +1094 @@
-                _chatConnectionSettings -> proxy_string_after = NULL;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -1352 +1272 @@
-
-#pragma mark -
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding toTarget:(NSString *) target asAction:(BOOL) action {
-        NSData *msg = [[self class] _flattenedIRCDataForMessage:message withEncoding:encoding andChatFormat:[self outgoingChatFormat]];
-        if( action ) {
-                NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :\001ACTION ", target];
-                [self sendRawMessageWithComponents:prefix, msg, @"\001", nil];
-                [prefix release];
-        } else {
-                NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :", target];
-                [self sendRawMessageWithComponents:prefix, msg, nil];
-                [prefix release];
-        }
-}
-
-- (void) sendRawMessage:(id) raw immediately:(BOOL) now {
@@ -1530 +1437 @@
-        if( _status != MVChatConnectionServerDisconnectedStatus )
-                _status = MVChatConnectionDisconnectedStatus;
+
+        id old = _localUser;
+        _localUser = nil;
+        [old release];
+
-        [self _didDisconnect];
-}
@@ -1537 +1449 @@
-        [self sendRawMessageWithFormat:@"NICK %@", [self nickname]];
-        [self sendRawMessageWithFormat:@"USER %@ %@ %@ :%@", [self username], [[NSHost currentHost] name], [self server], [self realName]];
+
+        id old = _localUser;
+        _localUser = [[MVIRCChatUser allocWithZone:nil] initLocalUserWithConnection:self];
+        [old release];
+
-        [self _didConnect];
-        [self _readNextMessageFromServer];
@@ -1552 +1469 @@
-        char *currentParameter = NULL;
-
-        NSString *senderString = nil;
-        NSString *usernameString = nil;
-        NSString *hostString = nil;
-        id commandObject = nil;
-        NSMutableArray *parameters = [[NSMutableArray allocWithZone:nil] initWithCapacity:15];
-
@@ -1636 +1549 @@
-
-end:
-        if( sender ) senderString = [[NSString allocWithZone:nil] initWithBytes:sender encoding:[self encoding]];
-        if( user ) usernameString = [[NSString allocWithZone:nil] initWithBytes:user encoding:[self encoding]];
-        if( host ) hostString = [[NSString allocWithZone:nil] initWithBytes:host encoding:[self encoding]];
-        if( command ) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:rawString, @"message", [NSNumber numberWithBool:NO], @"outbound", nil]];
+
-        [rawString release];
-
-        [senderString release];
-        [usernameString release];
-        [hostString release];
-        [commandObject release];
-        [parameters release];
-
@@ -1666 +1586 @@
-}
-
-- (void) _handleCommand:(id) command parameters:(NSArray *) parameters fromSender:(NSString *) sender username:(NSString *) user host:(NSString *) host {
-        NSLog(@"%@ %@ %@ %@ %@", sender, user, host, command, [parameters description] );
-}
-
-/* + (MVIRCChatConnection *) _connectionForServer:(SERVER_REC *) server {
-        if( ! server ) return nil;
-
-        MVIRCChatConnectionModuleData *data = MODULE_DATA( server );
-        if( data ) return [[(data -> connection) retain] autorelease];
-
-        return nil;
-}
-
-+ (void) _registerCallbacks {
-        signal_add_last( "server looking", (SIGNAL_FUNC) MVChatConnecting );
-        signal_add_last( "server connected", (SIGNAL_FUNC) MVChatConnected );
-        signal_add_last( "server disconnected", (SIGNAL_FUNC) MVChatDisconnect );
-        signal_add_last( "server connect failed", (SIGNAL_FUNC) MVChatConnectFailed );
-
-        signal_add( "server incoming", (SIGNAL_FUNC) MVChatRawIncomingMessage );
-        signal_add( "server outgoing", (SIGNAL_FUNC) MVChatRawOutgoingMessage );
-
-        signal_add_last( "channel joined", (SIGNAL_FUNC) MVChatJoinedRoom );
-        signal_add_last( "channel wholist", (SIGNAL_FUNC) MVChatJoinedWhoList );
-        signal_add_last( "event topic", (SIGNAL_FUNC) MVChatRoomTopicChanged );
-        signal_add_last( "channel destroyed", (SIGNAL_FUNC) MVChatLeftRoom );
-        signal_add_last( "channel mode changed", (SIGNAL_FUNC) MVChatGotRoomMode );
-
-        signal_add_last( "ban new", (SIGNAL_FUNC) MVChatBanNew );
-        signal_add_last( "ban remove", (SIGNAL_FUNC) MVChatBanRemove );
-
-        signal_add_last( "event join", (SIGNAL_FUNC) MVChatUserJoinedRoom );
-        signal_add_last( "event part", (SIGNAL_FUNC) MVChatUserLeftRoom );
-        signal_add_last( "event quit", (SIGNAL_FUNC) MVChatUserQuit );
-        signal_add_last( "event kick", (SIGNAL_FUNC) MVChatUserKicked );
-        signal_add_last( "event invite", (SIGNAL_FUNC) MVChatInvited );
-        signal_add_last( "event nick", (SIGNAL_FUNC) MVChatUserNicknameChanged );
-
-        signal_add_last( "event privmsg", (SIGNAL_FUNC) MVChatGetMessage );
-        signal_add_last( "event notice", (SIGNAL_FUNC) MVChatGetAutoMessage );
-        signal_add_last( "ctcp action", (SIGNAL_FUNC) MVChatGetActionMessage );
-
-        signal_add_last( "nick mode changed", (SIGNAL_FUNC) MVChatGotUserMode );
-
-        signal_add_last( "away mode changed", (SIGNAL_FUNC) MVChatSelfAwayChanged );
-
-        signal_add_last( "notifylist joined", (SIGNAL_FUNC) MVChatBuddyOnline );
-        signal_add_last( "notifylist left", (SIGNAL_FUNC) MVChatBuddyOffline );
-        signal_add_last( "notifylist away changed", (SIGNAL_FUNC) MVChatBuddyAway );
-        signal_add_last( "notifylist unidle", (SIGNAL_FUNC) MVChatBuddyUnidle );
-
-        signal_add_last( "event 301", (SIGNAL_FUNC) MVChatUserAway );
-        signal_add_last( "event 311", (SIGNAL_FUNC) MVChatUserWhois );
-        signal_add_last( "event 312", (SIGNAL_FUNC) MVChatUserServer );
-        signal_add_last( "event 313", (SIGNAL_FUNC) MVChatUserOperator );
-        signal_add_last( "event 317", (SIGNAL_FUNC) MVChatUserIdle );
-        signal_add_last( "event 318", (SIGNAL_FUNC) MVChatUserWhoisComplete );
-        signal_add_last( "event 319", (SIGNAL_FUNC) MVChatUserChannels );
-        signal_add_last( "event 320", (SIGNAL_FUNC) MVChatUserIdentified );
-        signal_add_last( "event 322", (SIGNAL_FUNC) MVChatListRoom );
-        signal_add_last( "event 368", (SIGNAL_FUNC) MVChatBanListFinished );
-        signal_add_last( "chanquery ban end", (SIGNAL_FUNC) MVChatBanListFinished );
-        signal_add_first( "event 433", (SIGNAL_FUNC) MVChatNickTaken );
-        signal_add_last( "event 001", (SIGNAL_FUNC) MVChatNickFinal );
-
-        // add all error codes we want to handle
-        signal_add_last( "event 401", (SIGNAL_FUNC) MVChatErrorNoSuchUser );
-        signal_add_last( "event 421", (SIGNAL_FUNC) MVChatErrorUnknownCommand );
-
-        // catch the notifylist whois ones as well
-        signal_add_last( "notifylist event whois end", (SIGNAL_FUNC) MVChatUserWhoisComplete );
-        signal_add_last( "notifylist event whois away", (SIGNAL_FUNC) MVChatUserAway );
-        signal_add_last( "notifylist event whois", (SIGNAL_FUNC) MVChatUserWhois );
-        signal_add_last( "notifylist event whois idle", (SIGNAL_FUNC) MVChatUserIdle );
-
-        signal_add_first( "ctcp msg", (SIGNAL_FUNC) MVChatSubcodeRequest );
-        signal_add_first( "ctcp reply", (SIGNAL_FUNC) MVChatSubcodeReply );
-
-        signal_add_last( "dcc request", (SIGNAL_FUNC) MVChatFileTransferRequest );
-}
-
-+ (void) _deregisterCallbacks {
-        signals_remove_module( MODULE_NAME );
-}
-*/
-+ (NSData *) _flattenedIRCDataForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format {
-        NSString *cformat = nil;
@@ -1783 +1618 @@
-
-        [super _didConnect];
-}
-
-- (void) _didNotConnect {
-        [self _setIrssiConnection:NULL];
-        [super _didNotConnect];
-}
-
-- (void) _didDisconnect {
-        if( _status == MVChatConnectionServerDisconnectedStatus ||
-                ( _chatConnection && _chatConnection -> connection_lost ) ) {
-                if( _status != MVChatConnectionSuspendedStatus )
-                        _status = MVChatConnectionServerDisconnectedStatus;
-                if( ABS( [_lastConnectAttempt timeIntervalSinceNow] ) > 300. )
-                        [self performSelector:@selector( connect ) withObject:nil afterDelay:5.];
-                [self scheduleReconnectAttemptEvery:30.];
-        }
-
-        [self _setIrssiConnection:NULL];
-        [super _didDisconnect];
-}
-
@@ -1896 +1712 @@
-                return;
-        }
-
-
-
+
-
-- (void) _updateKnownUser:(MVChatUser *) user withNewNickname:(NSString *) nickname {
@@ -1909 +1723 @@
-                [user release];
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@end
+
+#pragma mark -
+
+@implementation MVIRCChatConnection (MVIRCChatConnectionProtocolHandlers)
+- (void) _handleJoinWithParameters:(NSArray *) parameters fromSender:(id) sender {
+        if( [parameters count] ) {
+                NSString *name = [[NSString allocWithZone:nil] initWithData:[parameters objectAtIndex:0] encoding:[self encoding]];
+                MVChatRoom *room = [self joinedChatRoomWithName:name];
+
+                if( [sender isLocalUser] ) {
+                        if( ! room ) {
+                                room = [[MVIRCChatRoom allocWithZone:nil] initWithName:name andConnection:self];
+                                [self _addJoinedRoom:room];
+                                [room release];
+                        }
+
+                        [room _setDateJoined:[NSDate date]];
+                        [room _setDateParted:nil];
+                        [room _setNamesSynced:NO];
+                        [room _clearMemberUsers];
+                        [room _clearBannedUsers];
+                        [name release];
+
+                        [self sendRawMessageWithFormat:@"WHO %@", name];
+                } else {
+                        // user joined room
+                }
+        }
+}
+
+- (void) _handle353WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_NAMREPLY
+        if( [parameters count] == 4 ) {
+                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:2]];
+                if( room && ! [room _namesSynced] ) {
+                        NSString *names = [[NSString allocWithZone:nil] initWithData:[parameters objectAtIndex:3] encoding:[self encoding]];
+                        NSArray *members = [names componentsSeparatedByString:@" "];
+                        NSEnumerator *enumerator = [members objectEnumerator];
+                        NSString *memberName = nil;
+
+                        while( ( memberName = [enumerator nextObject] ) ) {
+                                unsigned int i = 0, len = [memberName length];
+                                if( ! len ) break;
+
+                                unsigned long modes = MVChatRoomMemberNoModes;
+                                BOOL done = NO;
+
+                                while( i < len && ! done ) {
+                                        unichar c = [memberName characterAtIndex:i];
+                                        switch( c ) {
+                                                case '+': modes |= MVChatRoomMemberVoicedMode; break;
+                                                case '%': modes |= MVChatRoomMemberHalfOperatorMode; break;
+                                                case '@': modes |= MVChatRoomMemberOperatorMode; break;
+                                                default: done = YES; break;
+                                        }
+                                        if( ! done ) i++;
+                                }
+
+                                if( i > 0 ) memberName = [memberName substringFromIndex:i];
+                                MVChatUser *member = [self chatUserWithUniqueIdentifier:memberName];
+                                [room _addMemberUser:member];
+                                [room _setModes:modes forMemberUser:member];
+                        }
+
+                        [names release];
+                }
+        }
+}
+
+- (void) _handle366WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_ENDOFNAMES
+        if( [parameters count] >= 2 ) {
+                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:1]];
+                if( room && ! [room _namesSynced] ) {
+                        [room _setNamesSynced:YES];
+                        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomJoinedNotification object:room];
+                }
+        }
+}
+
+- (void) _handle352WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_WHOREPLY
+        if( [parameters count] >= 6 ) {
+                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:1]];
+                MVChatUser *member = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:5]];
+                [member _setUsername:[parameters objectAtIndex:2]];
+                [member _setAddress:[parameters objectAtIndex:3]];
+        }
+}
+
+- (void) _handle315WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_ENDOFWHO
+        if( [parameters count] >= 2 ) {
+                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:1]];
+                if( room ) [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomMemberUsersSyncedNotification object:room];
+        }
+}
+@end

branches/cocoa-networking/Chat Core/MVIRCChatRoom.h

@@ -1 +1 @@
-#import "MVChatRoom.h"
+#import "MVChatRoomPrivate.h"
-
-@class MVIRCChatConnection;
-
-
+
+
+
-- (id) initWithName:(NSString *) name andConnection:(MVIRCChatConnection *) connection;
-@end
@@ -9 +12 @@
-#pragma mark -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-@end

branches/cocoa-networking/Chat Core/MVIRCChatRoom.m

@@ -226 +226 @@
-}
-@end
+
+#pragma mark -
+
+@implementation MVIRCChatRoom (MVIRCChatRoomPrivate)
+- (BOOL) _namesSynced {
+        return _namesSynced;
+}
+
+- (void) _setNamesSynced:(BOOL) synced {
+        _namesSynced = synced;
+}
+@end

branches/cocoa-networking/Chat Core/MVIRCChatUser.h

@@ -1 +1 @@
-#import "MVChatUser.h"
+#import "MVChatUserPrivate.h"
-
-@class MVIRCChatConnection;
@@ -7 +8 @@
-- (id) initWithNickname:(NSString *) nickname andConnection:(MVIRCChatConnection *) connection;
-@end
-
-#pragma mark -
-
-@interface MVChatUser (MVChatUserPrivate)
-- (void) _setUniqueIdentifier:(id) identifier;
-- (void) _setNickname:(NSString *) name;
-- (void) _setRealName:(NSString *) name;
-- (void) _setUsername:(NSString *) name;
-- (void) _setAddress:(NSString *) address;
-- (void) _setServerAddress:(NSString *) address;
-- (void) _setPublicKey:(NSData *) key;
-- (void) _setFingerprint:(NSString *) fingerprint;
-- (void) _setServerOperator:(BOOL) operator;
-- (void) _setIdentified:(BOOL) identified;
-- (void) _setIdleTime:(NSTimeInterval) time;
-- (void) _setStatus:(MVChatUserStatus) status;
-- (void) _setDateConnected:(NSDate *) date;
-- (void) _setDateDisconnected:(NSDate *) date;
-- (void) _setDateUpdated:(NSDate *) date;
-@end

branches/cocoa-networking/Chat Core/MVIRCFileTransfer.h

@@ -1 +1 @@
-#import "MVFileTransfer.h"
+#import "MVFileTransferPrivate.h"
-
-
-
+
-@end
-
-#pragma mark -
-
-
-
+
-@end

branches/cocoa-networking/Chat Core/MVSILCChatConnection.h

@@ +1 @@
+#import "MVChatConnection.h"
+#import "MVChatConnectionPrivate.h"
-#include <libsilc/silcincludes.h>
-#include <libsilcclient/silcclient.h>
-#import "MVChatConnection.h"
-
-#define SilcLock(client) silc_mutex_lock(silc_schedule_get_callback_lock((client)->schedule))
@@ -65 +66 @@
-- (NSString *) _publicKeyFilename:(SilcSocketType) connType andPublicKey:(unsigned char *) pk withLen:(SilcUInt32) pkLen usingSilcConn:(SilcClientConnection) conn;
-@end
-
-#pragma mark -
-
-@interface MVChatConnection (MVSILCChatConnectionPrivateSuper)
-- (void) _willConnect;
-- (void) _didConnect;
-- (void) _didNotConnect;
-- (void) _willDisconnect;
-- (void) _didDisconnect;
-- (void) _postError:(NSError *) error;
-- (void) _setStatus:(MVChatConnectionStatus) status;
-
-- (void) _addJoinedRoom:(MVChatRoom *) room;
-- (void) _removeJoinedRoom:(MVChatRoom *) room;
-@end

branches/cocoa-networking/Chat Core/MVSILCChatRoom.h

@@ -1 +1 @@
-#import "MVChatRoom.h"
+#import "MVChatRoomPrivate.h"
-#include <libsilcclient/client.h>
-#include <libsilc/silcincludes.h>
@@ -17 +18 @@
-- (void) updateWithChannelEntry:(SilcChannelEntry) channelEntry;
-@end
-
-#pragma mark -
-
-@interface MVChatRoom (MVChatRoomPrivate)
-- (void) _updateMemberUser:(MVChatUser *) user fromOldUniqueIdentifier:(id) identifier;
-- (void) _clearMemberUsers;
-- (void) _clearBannedUsers;
-- (void) _addMemberUser:(MVChatUser *) user;
-- (void) _removeMemberUser:(MVChatUser *) user;
-- (void) _addBanForUser:(MVChatUser *) user;
-- (void) _removeBanForUser:(MVChatUser *) user;
-- (void) _setMode:(MVChatRoomMemberMode) mode forMemberUser:(MVChatUser *) user;
-- (void) _removeMode:(MVChatRoomMemberMode) mode forMemberUser:(MVChatUser *) user;
-- (void) _setMode:(MVChatRoomMode) mode withAttribute:(id) attribute;
-- (void) _removeMode:(MVChatRoomMode) mode;
-- (void) _clearModes;
-- (void) _setDateJoined:(NSDate *) date;
-- (void) _setDateParted:(NSDate *) date;
-- (void) _setTopic:(NSData *) topic byAuthor:(MVChatUser *) author withDate:(NSDate *) date;
-@end

branches/cocoa-networking/Chat Core/MVSILCChatUser.h

@@ -1 +1 @@
-#import "MVChatUser.h"
+#import "MVChatUserPrivate.h"
-#include <libsilcclient/client.h>
-#include <libsilc/silcincludes.h>
@@ -14 +15 @@
-- (SilcClientEntry) _getClientEntry;
-@end
-
-#pragma mark -
-
-@interface MVChatUser (MVChatUserPrivate)
-- (void) _setUniqueIdentifier:(id) identifier;
-- (void) _setNickname:(NSString *) name;
-- (void) _setRealName:(NSString *) name;
-- (void) _setUsername:(NSString *) name;
-- (void) _setAddress:(NSString *) address;
-- (void) _setServerAddress:(NSString *) address;
-- (void) _setPublicKey:(NSData *) key;
-- (void) _setFingerprint:(NSString *) fingerprint;
-- (void) _setServerOperator:(BOOL) operator;
-- (void) _setIdentified:(BOOL) identified;
-- (void) _setIdleTime:(NSTimeInterval) time;
-- (void) _setStatus:(MVChatUserStatus) status;
-- (void) _setDateConnected:(NSDate *) date;
-- (void) _setDateDisconnected:(NSDate *) date;
-- (void) _setDateUpdated:(NSDate *) date;
-@end

branches/cocoa-networking/Chat Core/MVSILCFileTransfer.h

@@ +1 @@
+#import "MVFileTransfer.h"
+#import "MVFileTransferPrivate.h"
-#include <libsilc/silcincludes.h>
-#include <libsilcclient/silcclient.h>
-#import "MVFileTransfer.h"
-
-@interface MVSILCUploadFileTransfer : MVUploadFileTransfer {
@@ -19 +20 @@
-#pragma mark -
-
-@interface MVFileTransfer (MVSILCFileTransferPrivate)
-- (void) _setStatus:(MVFileTransferStatus) status;
-- (void) _postError:(NSError *) error;
-@end
-
-#pragma mark -
-
-@interface MVSILCUploadFileTransfer (MVSILCUploadFileTransferPrivate)
-- (SilcUInt32) _sessionID;