Changeset 3080

Timestamp:

12/24/05 23:28:57 (3 years ago)

Author:

timothy

Message:

• More code clean up.
  
• Added a new method to easily send mixed content. sendRawMessageWithComponents: will let you send a mix of strings and data. This is handy when sending connection encoded strings and pre-encoded data for room messages.
  

Files:

• branches/cocoa-networking/Chat Core/MVChatConnection.h (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVChatConnection.m (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (14 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatRoom.m (modified) (3 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatUser.m (modified) (1 diff)

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

@@ -211 +211 @@
-#pragma mark -
-
-NSString *
-NSString *
+id
+id
-- (void) sendRawMessageWithFormat:(NSString *) format, ...;
+- (void) sendRawMessageWithComponents:(id) firstComponent, ...;
-
-#pragma mark -

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

@@ -498 +498 @@
-#pragma mark -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        [self sendRawMessage:raw immediately:NO];
-}
-
-NSString *
+id
-// subclass this method
-        [self doesNotRecognizeSelector:_cmd];
@@ -531 +514 @@
-
-        NSString *command = [[NSString allocWithZone:nil] initWithFormat:format arguments:ap];
+
+        va_end( ap );
+
-        [self sendRawMessage:command immediately:NO];
-        [command release];
+}
+
+- (void) sendRawMessageWithComponents:(id) firstComponent, ... {
+        NSParameterAssert( firstComponent != nil );
+
+        NSMutableData *data = [[NSMutableData allocWithZone:nil] initWithCapacity:512];
+        id object = firstComponent;
+
+        va_list ap;
+        va_start( ap, firstComponent );
+
+        do {
+                if( [object isKindOfClass:[NSData class]] ) {
+                        [data appendData:object];
+                } else if( [firstComponent isKindOfClass:[NSString class]] ) {
+                        NSData *stringData = [object dataUsingEncoding:[self encoding] allowLossyConversion:YES];
+                        [data appendData:stringData];
+                } else {
+                        NSData *stringData = [[object description] dataUsingEncoding:[self encoding] allowLossyConversion:YES];
+                        [data appendData:stringData];
+                }
+        } while( object = va_arg( ap, void * ) );
-
-        va_end( ap );
+
+        [self sendRawMessage:data immediately:NO];
+        [data release];
-}
-

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

@@ -29 +29 @@
-- (void) _handleCommand:(id) command parameters:(NSArray *) parameters fromSender:(NSString *) sender username:(NSString *) user host:(NSString *) host;
-
-const char *) _flattenedIRCString
-forceDisconnect
+NSData *) _flattenedIRCData
+sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding toTarget:(NSString *) target asAction:(BOOL) action
-
-- (void) _processErrorCode:(int) errorCode withContext:(char *) context;
-
-- (void) _updateKnownUser:(MVChatUser *) user withNewNickname:(NSString *) nickname;
-
-- (oneway void) _sendMessage:(const char *) msg toTarget:(NSString *) target asAction:(BOOL) action;
-@end
-

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

@@ -1054 +1054 @@
-
-@implementation MVIRCChatConnection
-/*+ (void) initialize {
-        [super initialize];
-
-        static BOOL tooLate = NO;
-        if( ! tooLate ) {
-                pthread_mutexattr_t lockAttr;
-                pthread_mutexattr_init( &lockAttr );
-                pthread_mutexattr_settype( &lockAttr, PTHREAD_MUTEX_RECURSIVE );
-
-                extern pthread_mutex_t irssiLock;
-                pthread_mutex_init( &irssiLock, &lockAttr );
-
-                pthread_mutexattr_destroy( &lockAttr );
-
-                irssi_gui = IRSSI_GUI_NONE;
-
-                NSString *temp = NSTemporaryDirectory();
-                temp = [temp stringByAppendingPathComponent:@"Colloquy/Irssi"];
-                temp = [@"--home=" stringByAppendingString:temp];
-                char *args[] = { "Chat Core", (char *)[temp cString] };
-                core_init_paths( sizeof( args ) / sizeof( char * ), args );
-
-                core_init();
-                irc_init();
-
-                settings_set_bool( "override_coredump_limit", FALSE );
-                settings_set_bool( "settings_autosave", FALSE );
-                settings_set_str( "dcc_port", "1024 1048" );
-                signal_emit( "setup changed", 0 );
-
-                signal_emit( "irssi init finished", 0 );
-
-                [self _registerCallbacks];
-
-                [NSThread detachNewThreadSelector:@selector( _irssiRunLoop ) toTarget:self withObject:nil];
-                tooLate = YES;
-        }
-} */
-
-+ (NSArray *) defaultServerPorts {
-        return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedShort:6667],[NSNumber numberWithUnsignedShort:6660],[NSNumber numberWithUnsignedShort:6669],[NSNumber numberWithUnsignedShort:7000],[NSNumber numberWithUnsignedShort:994], nil];
@@ -1101 +1062 @@
-- (id) init {
-        if( ( self = [super init] ) ) {
-                _proxyUsername = nil;
-                _proxyPassword = nil;
-                _chatConnection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
+                _serverPort = 6667;
+                _server = @"irc.freenode.net";
+                _username = [NSUserName() retain];
+                _nickname = [_username retain];
+                _currentNickname = [_nickname retain];
+                _realName = [NSFullUserName() retain];
+
-                _knownUsers = [[NSMutableDictionary allocWithZone:nil] initWithCapacity:200];
-
-//              extern unsigned int connectionCount;
-//              connectionCount++;
-
-//              while( ! irssiThreadReady ) usleep( 50 );
-
-/*              IrssiLock();
-
-                CHAT_PROTOCOL_REC *proto = chat_protocol_find_id( IRC_PROTOCOL );
-                if( ! proto ) {
-                        IrssiUnlock();
-                        [self release];
-                        return nil;
-                }
-
-                SERVER_CONNECT_REC *settings = server_create_conn( proto -> id, "irc.freenode.net", 6667, NULL, NULL, [self encodedBytesWithString:NSUserName()] );
-                if( ! settings ) {
-                        IrssiUnlock();
-                        [self release];
-                        return nil;
-                }
-
-                [self _setIrssiConnectSettings:settings];
-
-                IrssiUnlock(); */
-        }
-
@@ -1147 +1088 @@
-        [_proxyPassword release];
-        _proxyPassword = nil;
-
-//      [self _setIrssiConnection:NULL];
-//      [self _setIrssiConnectSettings:NULL];
-
-//      extern unsigned int connectionCount;
-//      connectionCount--;
-
-        [super dealloc];
@@ -1192 +1127 @@
-        [self _willConnect]; // call early so other code has a chance to change our info
-
-
-
-
+
+
-
-/*      IrssiLock();
@@ -1248 +1182 @@
-        if( [self status] == MVChatConnectionConnectedStatus ) {
-                if( [[reason string] length] ) {
-const char *msg = [[self class] _flattenedIRCString
-:[NSString stringWithFormat:@"QUIT :%s", msg] immediately:YES
- immediately:YES
+NSData *msg = [[self class] _flattenedIRCData
+WithComponents:@"QUIT :", msg, nil
+
-        }
-
@@ -1276 +1210 @@
-        NSParameterAssert( [nickname length] > 0 );
-
+        if( [nickname isEqualToString:[self nickname]] )
+                return;
+
-        id old = _nickname;
-        _nickname = [nickname copyWithZone:nil];
-        [old release];
-
-
+
+
-                _currentNickname = [_nickname retain];
-
-
+
+
+
+
-                [self sendRawMessageWithFormat:@"NICK %@", nickname];
-}
@@ -1413 +1353 @@
-#pragma mark -
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        NSParameterAssert( raw != nil );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [data appendBytes:"\x0D\x0A" length:2];
-
-        [_chatConnection writeData:data withTimeout:-1. tag:0];
+
+        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:string, @"message", [NSNumber numberWithBool:YES], @"outbound", nil]];
+
+        [string release];
-        [data release];
-
-        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:raw, @"message", [NSNumber numberWithBool:YES], @"outbound", nil]];
-}
-
@@ -1507 +1473 @@
-        NSParameterAssert( [[user nickname] length] > 0 );
-
-/*      IrssiLock();
-        const char *mask = [self encodedBytesWithString:[NSString stringWithFormat:@"%@!*@*", [user nickname]]];
-        if( ! notifylist_find( mask, NULL ) ) notifylist_add( mask, NULL, TRUE, 600 );
-        IrssiUnlock(); */
-}
-
@@ -1517 +1479 @@
-        NSParameterAssert( [[user nickname] length] > 0 );
-
-/*      IrssiLock();
-        notifylist_remove( [self encodedBytesWithString:[NSString stringWithFormat:@"%@!*@*", [user nickname]]] );
-        IrssiUnlock(); */
-}
-
@@ -1547 +1506 @@
-
-                _awayMessage = [message copyWithZone:nil];
-
-
-
-
-
-
+
+
+
-        } else {
-                [[self localUser] _setStatus:MVChatUserAvailableStatus];
-                [self sendRawMessage:@"AWAY"];
-        }
-}
-
-#pragma mark -
-
-- (unsigned int) lag {
-        unsigned int lag = 0;
-
-/*      IrssiLock();
-        if( _chatConnection )
-                lag = _chatConnection -> lag;
-        IrssiUnlock(); */
-
-        return lag;
-}
-@end
@@ -1807 +1750 @@
-        signals_remove_module( MODULE_NAME );
-}
-
-const char *) _flattenedIRCString
+
+NSData *) _flattenedIRCData
-        NSString *cformat = nil;
-
@@ -1824 +1767 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-#pragma mark -
-
@@ -1946 +1802 @@
-        [self _setIrssiConnection:NULL];
-        [super _didDisconnect];
-}
-
-- (void) _forceDisconnect {
-        if( ! _chatConnection ) return;
-
-        [self _willDisconnect];
-
-        IrssiLock();
-
-        if( _chatConnection -> handle ) {
-                g_io_channel_unref( net_sendbuffer_handle( _chatConnection -> handle ) );
-                net_sendbuffer_destroy( _chatConnection -> handle, FALSE);
-                _chatConnection -> handle = NULL;
-        }
-
-        _chatConnection -> connection_lost = FALSE;
-        _chatConnection -> no_reconnect = FALSE;
-
-        server_disconnect( _chatConnection );
-
-        [super _didDisconnect];
-
-        [self _setIrssiConnection:NULL];
-
-        IrssiUnlock();
-}
-
@@ -2078 +1909 @@
-                [user release];
-        }
-}
-
-#pragma mark -
-
-- (oneway void) _sendMessage:(const char *) msg toTarget:(NSString *) target asAction:(BOOL) action {
-        IrssiLock();
-
-        if( _chatConnection ) {
-                if( ! action ) _chatConnection -> send_message( _chatConnection, [self encodedBytesWithString:target], msg, 0 );
-                else irc_send_cmdv( (IRC_SERVER_REC *) _chatConnection, "PRIVMSG %s :\001ACTION %s\001", [self encodedBytesWithString:target], msg );
-        }
-
-        IrssiUnlock();
-} */
-@end

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

@@ -44 +44 @@
-- (void) setTopic:(NSAttributedString *) topic {
-        NSParameterAssert( topic != nil );
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -56 +54 @@
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
-        NSParameterAssert( message != nil );
-
-
+
-}
-
@@ -211 +208 @@
-        [super kickOutMemberUser:user forReason:reason];
-
-/*      IrssiLock();
-
-        if( reason ) {
-const char *msg = [MVIRCChatConnection _flattenedIRCString
-irc_send_cmdv( (IRC_SERVER_REC *) [[self connection] _irssiConnection], "KICK %s %s :%s", [[self connection] encodedBytesWithString:[self name]], [[self connection] encodedBytesWithString:[user nickname]], msg )
-} else irc_send_cmdv( (IRC_SERVER_REC *) [[self connection] _irssiConnection], "KICK %s %s", [[self connection] encodedBytesWithString:[self name]], [[self connection] encodedBytesWithString:[user nickname]] )
-
-IrssiUnlock(); */
+NSData *msg = [MVIRCChatConnection _flattenedIRCData
+NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"KICK %@ %@ :", [self name], [user nickname]]
+       [[self connection] sendRawMessageWithComponents:prefix, msg, nil]
+
+} else [[self connection] sendRawMessageWithFormat:@"KICK %@ %@", [self name], [user nickname]];
-}
-

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

@@ -43 +43 @@
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
-        NSParameterAssert( message != nil );
-const char *msg = [MVIRCChatConnection _flattenedIRCString
-s
+NSData *msg = [MVIRCChatConnection _flattenedIRCData
+essage withEncoding:encodin
-}
-