Fixes issue {1}. This will affect Cocoa and F-Script plugins that use…

… processIncomingMessage and processOutgoingMessage.
colloquy · Feb 24, 2005 · 06d69c1 · 06d69c1
1 parent a6d2cda
commit 06d69c1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/JVChatRoomPanel.m b/JVChatRoomPanel.m
@@ -305,11 +305,12 @@ - (void) processIncomingMessage:(JVMutableChatMessage *) message {
 		}
 	}
 
-	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), nil];
+	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), @encode( id ), nil];
 	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 
-	[invocation setSelector:@selector( processIncomingMessage: )];
+	[invocation setSelector:@selector( processIncomingMessage:inView: )];
 	[invocation setArgument:&message atIndex:2];
+	[invocation setArgument:&self atIndex:3];
 
 	[[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation stoppingOnFirstSuccessfulReturn:NO];
 }

diff --git a/JVDirectChatPanel.h b/JVDirectChatPanel.h
@@ -66,6 +66,6 @@
 @end
 
 @interface NSObject (MVChatPluginDirectChatSupport)
-- (void) processIncomingMessage:(JVMutableChatMessage *) message;
-- (void) processOutgoingMessage:(JVMutableChatMessage *) message;
+- (void) processIncomingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view;
+- (void) processOutgoingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view;
 @end
diff --git a/JVDirectChatPanel.m b/JVDirectChatPanel.m
@@ -781,11 +781,12 @@ - (void) processIncomingMessage:(JVMutableChatMessage *) message {
 		}
 	}
 
-	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), nil];
+	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), @encode( id ), nil];
 	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 
-	[invocation setSelector:@selector( processIncomingMessage: )];
+	[invocation setSelector:@selector( processIncomingMessage:inView: )];
 	[invocation setArgument:&message atIndex:2];
+	[invocation setArgument:&self atIndex:3];
 
 	[[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation stoppingOnFirstSuccessfulReturn:NO];
 }
@@ -909,11 +910,12 @@ - (IBAction) send:(id) sender {
 }
 
 - (void) sendMessage:(JVMutableChatMessage *) message {
-	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), nil];
+	NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( JVMutableChatMessage * ), @encode( id ), nil];
 	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 
-	[invocation setSelector:@selector( processOutgoingMessage: )];
+	[invocation setSelector:@selector( processOutgoingMessage:inView: )];
 	[invocation setArgument:&message atIndex:2];
+	[invocation setArgument:&self atIndex:3];
 
 	[self _setCurrentMessage:message];
 	[[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation stoppingOnFirstSuccessfulReturn:NO];

diff --git a/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.m b/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.m
@@ -422,13 +422,13 @@ - (BOOL) handleClickedLink:(NSURL *) url inView:(id <JVChatViewController>) view
 	return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
 }
 
-- (void) processIncomingMessage:(JVMutableChatMessage *) message {
-	NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"piM1", [message sender], @"piM2", [message transcript], @"piM3", nil];
+- (void) processIncomingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view {
+	NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"piM1", [message sender], @"piM2", view, @"piM3", nil];
 	[self callScriptHandler:'piMX' withArguments:args forSelector:_cmd];
 }
 
-- (void) processOutgoingMessage:(JVMutableChatMessage *) message {
-	NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"poM1", [message transcript], @"poM2", nil];
+- (void) processOutgoingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view {
+	NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"poM1", view, @"poM2", nil];
 	[self callScriptHandler:'poMX' withArguments:args forSelector:_cmd];
 }
 

diff --git a/Plug-Ins/F-Script Support/JVFScriptChatPlugin.m b/Plug-Ins/F-Script Support/JVFScriptChatPlugin.m
@@ -142,13 +142,13 @@ - (BOOL) handleClickedLink:(NSURL *) url inView:(id <JVChatViewController>) view
 	return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
 }
 
-- (void) processIncomingMessage:(JVMutableChatMessage *) message {
-	NSArray *args = [NSArray arrayWithObject:message];
+- (void) processIncomingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view {
+	NSArray *args = [NSArray arrayWithObjects:message, view, nil];
 	[self callScriptBlockNamed:@"processIncomingMessage" withArguments:args forSelector:_cmd];
 }
 
-- (void) processOutgoingMessage:(JVMutableChatMessage *) message {
-	NSArray *args = [NSArray arrayWithObject:message];
+- (void) processOutgoingMessage:(JVMutableChatMessage *) message inView:(id <JVChatViewController>) view {
+	NSArray *args = [NSArray arrayWithObjects:message, view, nil];
 	[self callScriptBlockNamed:@"processOutgoingMessage" withArguments:args forSelector:_cmd];
 }