# HG changeset patch
# User William Bowling <will@wbowling.info>
# Date 1257080810 -39600
# Node ID 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b
# Parent  3b45cc82a83936e59d5cec1121f85879b5c3f2d3
Adds Message send (Group Chat) event. Ref #12316

diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Frameworks/Adium Framework/Source/AIAdiumProtocol.h
--- a/Frameworks/Adium Framework/Source/AIAdiumProtocol.h	Sun Nov 01 15:37:33 2009 +1100
+++ b/Frameworks/Adium Framework/Source/AIAdiumProtocol.h	Mon Nov 02 00:06:50 2009 +1100
@@ -83,6 +83,7 @@
 #define CONTACT_STATUS_MOBILE_YES			@"Contact_StatusMobileYes"
 #define CONTACT_STATUS_MOBILE_NO			@"Contact_StatusMobileNo"
 #define CONTENT_MESSAGE_SENT				@"Content_MessageSent"
+#define CONTENT_MESSAGE_SENT_GROUP			@"Content_MessageSentGroup"
 #define CONTENT_MESSAGE_RECEIVED			@"Content_MessageReceived"
 #define CONTENT_MESSAGE_RECEIVED_GROUP		@"Content_MessageReceivedGroup"
 #define CONTENT_MESSAGE_RECEIVED_FIRST		@"Content_MessageReceivedFirst"
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AIAutoReplyPlugin.m
--- a/Source/AIAutoReplyPlugin.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AIAutoReplyPlugin.m	Mon Nov 02 00:06:50 2009 +1100
@@ -56,6 +56,9 @@
 								   selector:@selector(didSendContent:)
 									   name:CONTENT_MESSAGE_SENT object:nil];
 	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(didSendContent:)
+												 name:CONTENT_MESSAGE_SENT_GROUP object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
 								   selector:@selector(chatWillClose:)
 									   name:Chat_WillClose object:nil];
 	
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AIChatController.m
--- a/Source/AIChatController.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AIChatController.m	Mon Nov 02 00:06:50 2009 +1100
@@ -78,6 +78,11 @@
 									   name:CONTENT_MESSAGE_SENT
 									 object:nil];
 	
+	[[NSNotificationCenter defaultCenter] addObserver:self 
+											 selector:@selector(didExchangeContent:) 
+												 name:CONTENT_MESSAGE_SENT_GROUP
+											   object:nil];
+	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 								   selector:@selector(adiumWillTerminate:)
 									   name:AIAppWillTerminateNotification
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AIContactController.m
--- a/Source/AIContactController.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AIContactController.m	Mon Nov 02 00:06:50 2009 +1100
@@ -153,6 +153,11 @@
                                        name:CONTENT_MESSAGE_SENT
                                      object:nil];
 	
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(didSendContent:)
+												 name:CONTENT_MESSAGE_SENT_GROUP
+											   object:nil];
+	
 	[self loadContactList];
 	[self sortContactList];
 	
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AIContentController.m
--- a/Source/AIContentController.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AIContentController.m	Mon Nov 02 00:06:50 2009 +1100
@@ -370,7 +370,7 @@
 			}
 			
 			//Did send content
-			[adium.contactAlertsController generateEvent:CONTENT_MESSAGE_SENT
+			[adium.contactAlertsController generateEvent:[chat isGroupChat] ? CONTENT_MESSAGE_SENT_GROUP : CONTENT_MESSAGE_SENT
 											 forListObject:listObject
 												  userInfo:[NSDictionary dictionaryWithObjectsAndKeys:chat,@"AIChat",inObject,@"AIContentObject",nil]
 							  previouslyPerformedActionIDs:nil];
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AdiumMessageEvents.m
--- a/Source/AdiumMessageEvents.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AdiumMessageEvents.m	Mon Nov 02 00:06:50 2009 +1100
@@ -44,6 +44,7 @@
 {
 	//Register the events we generate
 	[adium.contactAlertsController registerEventID:CONTENT_MESSAGE_SENT withHandler:self inGroup:AIMessageEventHandlerGroup globalOnly:NO];
+	[adium.contactAlertsController registerEventID:CONTENT_MESSAGE_SENT_GROUP withHandler:self inGroup:AIMessageEventHandlerGroup globalOnly:NO];
 	[adium.contactAlertsController registerEventID:CONTENT_MESSAGE_RECEIVED withHandler:self inGroup:AIMessageEventHandlerGroup globalOnly:NO];
 	[adium.contactAlertsController registerEventID:CONTENT_MESSAGE_RECEIVED_FIRST withHandler:self inGroup:AIMessageEventHandlerGroup globalOnly:NO];
 	[adium.contactAlertsController registerEventID:CONTENT_MESSAGE_RECEIVED_BACKGROUND withHandler:self inGroup:AIMessageEventHandlerGroup globalOnly:NO];
@@ -166,6 +167,8 @@
 	
 	if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
 		description = AILocalizedString(@"Is sent a message",nil);
+	} else if ([eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
+		description = AILocalizedString(@"Is sent a message in a group chat",nil);
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED]) {
 		description = AILocalizedString(@"Sends a message",nil);
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST]) {
@@ -191,6 +194,8 @@
 	
 	if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
 		description = AILocalizedString(@"Message sent",nil);
+	} else if ([eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
+		description = AILocalizedString(@"Message sent (Group Chat)",nil);
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED]) {
 		description = AILocalizedString(@"Message received",nil);
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST]) {
@@ -218,6 +223,8 @@
 	
 	if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
 		description = @"Message Sent";
+	} else if ([eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
+		description = @"Message Sent (Group Chat)";
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED]) {
 		description = @"Message Received";
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST]) {
@@ -247,6 +254,8 @@
 		
 		if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
 			format = AILocalizedString(@"When you send %@ a message",nil);
+		} else if ([eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
+			format = AILocalizedString(@"When you send %@ a message in a group chat",nil);
 		} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED]) {
 			format = AILocalizedString(@"When %@ sends a message to you",nil);
 		} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST]) {
@@ -274,6 +283,8 @@
 	} else {
 		if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
 			description = AILocalizedString(@"When you send a message",nil);
+		} else if ([eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
+			description = AILocalizedString(@"When you send a message in a group chat",nil);
 		} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED]) {
 			description = AILocalizedString(@"When you receive any message",nil);
 		} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST]) {
@@ -311,7 +322,8 @@
 
 	if (includeSubject) {
 		
-		if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
+		if ([eventID isEqualToString:CONTENT_MESSAGE_SENT] ||
+			[eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
 			displayName = (listObject ? listObject.displayName : contentObject.chat.name);
 		
 			if (messageText && messageText.length) {
@@ -411,7 +423,8 @@
 {
 	NSString *format = nil;
 	
-	if ([eventID isEqualToString:CONTENT_MESSAGE_SENT]) {
+	if ([eventID isEqualToString:CONTENT_MESSAGE_SENT] ||
+		[eventID isEqualToString:CONTENT_MESSAGE_SENT_GROUP]) {
 		format = AILocalizedString(@"%u messages sent",nil);
 	} else if ([eventID isEqualToString:CONTENT_MESSAGE_RECEIVED] || 
 			   [eventID isEqualToString:CONTENT_MESSAGE_RECEIVED_FIRST] ||
diff -r 3b45cc82a83936e59d5cec1121f85879b5c3f2d3 -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b Source/AdiumPreferredAccounts.m
--- a/Source/AdiumPreferredAccounts.m	Sun Nov 01 15:37:33 2009 +1100
+++ b/Source/AdiumPreferredAccounts.m	Mon Nov 02 00:06:50 2009 +1100
@@ -40,7 +40,11 @@
 		[[NSNotificationCenter defaultCenter] addObserver:self
 									   selector:@selector(didSendContent:)
 										   name:CONTENT_MESSAGE_SENT
-										 object:nil];		
+										 object:nil];	
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(didSendContent:)
+													 name:CONTENT_MESSAGE_SENT_GROUP
+												   object:nil];	
 	}
 	
 	return self;