Ticket #1005: Colloquy_DataPatch_r57.patch

MVIRCChatConnection.h

@@ -45 +45 @@
 - (void) _handleCTCP:(NSMutableData *) data asRequest:(BOOL) request fromSender:(MVChatUser *) sender forRoom:(MVChatRoom *) room;
     
 + (NSData *) _flattenedIRCDataForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format;
-- (void) _sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding toTarget:(NSString *) target asAction:(BOOL) action;
+- (void) _sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) msgEncoding toTarget:(id) target asAction:(BOOL) action;
 
 - (void) _processErrorCode:(int) errorCode withContext:(char *) context;
 
@@ -69 +69 @@
 - (NSString *) _newStringWithBytes:(const char *) bytes length:(unsigned) length;
 - (NSString *) _stringFromPossibleData:(id) input;
 @end
+
+#pragma mark -
+
+@protocol MVIRCChatConnectionPlugin
+/// receiver is either nil or MVChatRoom.
+- (void) processIncomingMessageAsData:(NSMutableData *)message from:(MVChatUser *)sender to:(id)receiver isNotice:(BOOL)isNotice;
+/// No from, as it's always the local user.
+/// receiver is either MVChatUser or MVChatRoom.
+- (void) processOutgoingMessageAsData:(NSMutableData *)message to:(id)receiver;
+@end

MVIRCChatConnection.m

@@ -930 +930 @@
     return [message chatFormatWithOptions:options];
 }
 
-- (void) _sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) msgEncoding toTarget:(NSString *) target asAction:(BOOL) action {
-    NSData *msg = [[self class] _flattenedIRCDataForMessage:message withEncoding:msgEncoding andChatFormat:[self outgoingChatFormat]];
+- (void) _sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) msgEncoding toTarget:(id) target asAction:(BOOL) action {
+   NSParameterAssert([target isKindOfClass:[MVChatUser class]] || [target isKindOfClass:[MVChatRoom class]]);
+   
+    NSMutableData *msg = [[[[self class] _flattenedIRCDataForMessage:message withEncoding:msgEncoding andChatFormat:[self outgoingChatFormat]] mutableCopyWithZone:nil] autorelease];
+   
+
+    NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( id ), nil];
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setSelector:@selector( processOutgoingMessageAsData:to: )];
+    [invocation setArgument:&msg atIndex:2];
+    [invocation setArgument:&target atIndex:3];
+
+   [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+   if ([msg length] <= 0)
+      return;
+   
+   
+   NSString *targetName = [target isKindOfClass:[MVChatRoom class]] ? [target name] : [target nickname];
+   
     if( action ) {
-        NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :\001ACTION ", target];
+        NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :\001ACTION ", targetName];
         [self sendRawMessageWithComponents:prefix, msg, @"\001", nil];
         [prefix release];
     } else {
-        NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :", target];
+        NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :", targetName];
         [self sendRawMessageWithComponents:prefix, msg, nil];
         [prefix release];
     }
@@ -1437 +1454 @@
 #pragma mark -
 #pragma mark Incoming Message Replies
 
+- (void) _handlePrivmsg:(NSDictionary *)privmsgInfo {
+   MVAssertMainThreadRequired();
+   
+   MVChatRoom *room = [privmsgInfo objectForKey:@"room"];
+   MVChatUser *sender = [privmsgInfo objectForKey:@"user"];
+   NSMutableData *message = [privmsgInfo objectForKey:@"message"];
+   BOOL isNotice = NO;
+   
+   
+    NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( MVChatUser * ), @encode( id ), @encode( BOOL ), nil];
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setSelector:@selector( processIncomingMessageAsData:from:to:isNotice: )];
+    [invocation setArgument:&message atIndex:2];
+    [invocation setArgument:&sender atIndex:3];
+    [invocation setArgument:&room atIndex:4];
+    [invocation setArgument:&isNotice atIndex:5];
+   
+   [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+   if ([message length] <= 0)
+      return;
+   
+   
+   if ( room ) {
+      [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomGotMessageNotification 
+                                                          object:room
+                                                        userInfo:privmsgInfo];
+   } else {
+      [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotPrivateMessageNotification 
+                                                          object:sender
+                                                        userInfo:privmsgInfo];
+   }
+}
+
 - (void) _handlePrivmsgWithParameters:(NSArray *) parameters fromSender:(MVChatUser *) sender {
     MVAssertCorrectThreadRequired( _connectionThread );
 
@@ -1462 +1512 @@
         NSMutableData *msgData = [parameters objectAtIndex:1];
         const char *bytes = (const char *)[msgData bytes];
         BOOL ctcp = ( *bytes == '\001' && [msgData length] > 2 );
-
+      
         [sender _setIdleTime:0.];
         [self _markUserAsOnline:sender];
-
+      
+      MVChatRoom *room = nil;
         if( [[self chatRoomNamePrefixes] characterIsMember:[targetName characterAtIndex:0]] ) {
-            MVChatRoom *room = [self joinedChatRoomWithName:targetName];
-            if( ctcp ) [self _handleCTCP:msgData asRequest:YES fromSender:sender forRoom:room];
-            else [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomGotMessageNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", msgData, @"message", [NSString locallyUniqueString], @"identifier", nil]];
-        } else {
-            if( ctcp ) [self _handleCTCP:msgData asRequest:YES fromSender:sender forRoom:nil];
-            else [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotPrivateMessageNotification object:sender userInfo:[NSDictionary dictionaryWithObjectsAndKeys:msgData, @"message", [NSString locallyUniqueString], @"identifier", nil]];
-        }
+            room = [self joinedChatRoomWithName:targetName];
+      }
+      
+      if ( ctcp ) {
+         [self _handleCTCP:msgData asRequest:YES fromSender:sender forRoom:room];
+      } else {
+         NSDictionary *privmsgInfo = [NSDictionary dictionaryWithObjectsAndKeys:
+            msgData, @"message",
+            sender, @"user",
+            [NSString locallyUniqueString], @"identifier",
+            room, @"room",  // room can be nil, if the privmsg wasn't directed at a chat-room.
+            nil];
+         [self performSelectorOnMainThread:@selector(_handlePrivmsg:) withObject:privmsgInfo waitUntilDone:NO];
+      }
     }
 }
 
+- (void) _handleNotice:(NSDictionary *)noticeInfo {
+   MVAssertMainThreadRequired();
+   
+   MVChatRoom *room = [noticeInfo objectForKey:@"room"];
+   MVChatUser *sender = [noticeInfo objectForKey:@"user"];
+   NSMutableData *message = [noticeInfo objectForKey:@"message"];
+   BOOL isNotice = YES;
+
+   
+    NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( MVChatUser * ), @encode( id ), @encode( BOOL ), nil];
+    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+    [invocation setSelector:@selector( processIncomingMessageAsData:from:to:isNotice: )];
+    [invocation setArgument:&message atIndex:2];
+    [invocation setArgument:&sender atIndex:3];
+    [invocation setArgument:&room atIndex:4];
+    [invocation setArgument:&isNotice atIndex:5];
+   
+   [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+   if ([message length] <= 0)
+      return;
+
+   
+   if ( room ) {
+      [[NSNotificationCenter defaultCenter] postNotificationName:MVChatRoomGotMessageNotification 
+                                                          object:room
+                                                        userInfo:noticeInfo];
+   } else {
+      [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotPrivateMessageNotification 
+                                                          object:sender
+                                                        userInfo:noticeInfo];
+
+      if( [[sender nickname] isEqualToString:@"NickServ"] ) {
+         NSString *msg = [self _newStringWithBytes:[message bytes] length:[message length]];
+         
+         if( [msg hasCaseInsensitiveSubstring:@"NickServ"] && [msg hasCaseInsensitiveSubstring:@"IDENTIFY"] ) {
+            if( ! [self nicknamePassword] ) {
+               [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionNeedNicknamePasswordNotification object:self userInfo:nil];
+            } else [self sendRawMessageImmediatelyWithFormat:@"NickServ IDENTIFY %@", [self nicknamePassword]];
+         } else if( [msg hasCaseInsensitiveSubstring:@"password accepted"] ) {
+            [[self localUser] _setIdentified:YES];
+         } else if( [msg hasCaseInsensitiveSubstring:@"authentication required"] || [msg hasCaseInsensitiveSubstring:@"nickname is owned"] ) {
+            [[self localUser] _setIdentified:NO];
+         }
+         
+         [msg release];
+      }
+   }
+}
+
 - (void) _handleNoticeWithParameters:(NSArray *) parameters fromSender:(MVChatUser *) sender {
     MVAssertCorrectThreadRequired( _connectionThread );
 
@@ -1503 +1610 @@
         const char *bytes = (const char *)[msgData bytes];
         BOOL ctcp = ( *bytes == '\001' && [msgData length] > 2 );
 
+      MVChatRoom *room = nil;
         if( [[self chatRoomNamePrefixes] characterIsMember:[targetName characterAtIndex:0]] ) {
-            MVChatRoom *room = [self joinedChatRoomWithName:targetName];
-            if( ctcp ) [self _handleCTCP:msgData asRequest:NO fromSender:sender forRoom:room];
-            else [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomGotMessageNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", msgData, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"notice", nil]];
-        } else {
-            if( ctcp ) [self _handleCTCP:msgData asRequest:NO fromSender:sender forRoom:nil];
-            else {
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotPrivateMessageNotification object:sender userInfo:[NSDictionary dictionaryWithObjectsAndKeys:msgData, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"notice", nil]];
-                if( [[sender nickname] isEqualToString:@"NickServ"] ) {
-                    NSString *msg = [self _newStringWithBytes:[msgData bytes] length:[msgData length]];
-
-                    if( [msg hasCaseInsensitiveSubstring:@"NickServ"] && [msg hasCaseInsensitiveSubstring:@"IDENTIFY"] ) {
-                        if( ! [self nicknamePassword] ) {
-                            [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionNeedNicknamePasswordNotification object:self userInfo:nil];
-                        } else [self sendRawMessageImmediatelyWithFormat:@"NickServ IDENTIFY %@", [self nicknamePassword]];
-                    } else if( [msg hasCaseInsensitiveSubstring:@"password accepted"] ) {
-                        [[self localUser] _setIdentified:YES];
-                    } else if( [msg hasCaseInsensitiveSubstring:@"authentication required"] || [msg hasCaseInsensitiveSubstring:@"nickname is owned"] ) {
-                        [[self localUser] _setIdentified:NO];
-                    }
-
-                    [msg release];
-                }
-            }
-        }
+            room = [self joinedChatRoomWithName:targetName];
+      }
+      
+      if ( ctcp ) {
+         [self _handleCTCP:msgData asRequest:NO fromSender:sender forRoom:room];
+      } else {
+         NSDictionary *noticeInfo = [NSDictionary dictionaryWithObjectsAndKeys:
+            msgData, @"message",
+            sender, @"user",
+            [NSString locallyUniqueString], @"identifier",
+            [NSNumber numberWithBool:YES], @"notice",
+            room, @"room", // room can be nil, if the notice wasn't directed at a chat-room.
+            nil];
+         [self performSelectorOnMainThread:@selector(_handleNotice:) withObject:noticeInfo waitUntilDone:NO];
+      }
     }
 }
 
@@ -1554 +1653 @@
 
     if( [command isCaseInsensitiveEqualToString:@"ACTION"] && arguments ) {
         // special case ACTION and send it out like a message with the action flag
-        if( room ) [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomGotMessageNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", arguments, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"action", nil]];
-        else [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotPrivateMessageNotification object:sender userInfo:[NSDictionary dictionaryWithObjectsAndKeys:arguments, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"action", nil]];
+      NSDictionary *msgInfo = [NSDictionary dictionaryWithObjectsAndKeys:
+         [arguments mutableCopyWithZone:nil], @"message",
+         sender, @"user",
+         [NSString locallyUniqueString], @"identifier",
+         [NSNumber numberWithBool:YES], @"action",
+         room, @"room",  // room can be nil, if the ctcp wasn't directed at a chat-room.
+         nil];
+      [self _handlePrivmsg:msgInfo]; // No need to explicitly call this on main thread, as we are already in it.
+      
         [command release];
         [arguments release];
         [ctcpInfo release];

MVIRCChatRoom.m

@@ -55 +55 @@
 
 - (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) msgEncoding asAction:(BOOL) action {
     NSParameterAssert( message != nil );
-    [[self connection] _sendMessage:message withEncoding:msgEncoding toTarget:[self name] asAction:action];
+    [[self connection] _sendMessage:message withEncoding:msgEncoding toTarget:self asAction:action];
 }
 
 #pragma mark -

MVIRCChatUser.m

@@ -43 +43 @@
 
 - (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
     NSParameterAssert( message != nil );
-    [[self connection] _sendMessage:message withEncoding:encoding toTarget:[self nickname] asAction:action];
+    [[self connection] _sendMessage:message withEncoding:encoding toTarget:self asAction:action];
 }
 
 - (void) sendSubcodeRequest:(NSString *) command withArguments:(id) arguments {