adium 3371:613b8f4a5511: Adds 'Message sent (Group Chat)' event....
commits at adium.im
commits at adium.im
Sun Oct 17 20:12:39 UTC 2010
details: http://hg.adium.im/adium/rev/613b8f4a5511
revision: 3371:613b8f4a5511
author: Frank Dowsett <wixardy at adium.im>
date: Sun Oct 17 16:09:35 2010 -0400
Adds 'Message sent (Group Chat)' event. Fixes #12316 thanks Will
diffs (158 lines):
diff -r 7ff9edb28862 -r 613b8f4a5511 Frameworks/Adium Framework/Source/AIAdiumProtocol.h
--- a/Frameworks/Adium Framework/Source/AIAdiumProtocol.h Sat Oct 16 15:43:29 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIAdiumProtocol.h Sun Oct 17 16:09:35 2010 -0400
@@ -84,6 +84,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 7ff9edb28862 -r 613b8f4a5511 Source/AIAutoReplyPlugin.m
--- a/Source/AIAutoReplyPlugin.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AIAutoReplyPlugin.m Sun Oct 17 16:09:35 2010 -0400
@@ -62,6 +62,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 7ff9edb28862 -r 613b8f4a5511 Source/AIChatController.m
--- a/Source/AIChatController.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AIChatController.m Sun Oct 17 16:09:35 2010 -0400
@@ -85,6 +85,11 @@
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
object:nil];
diff -r 7ff9edb28862 -r 613b8f4a5511 Source/AIContactController.m
--- a/Source/AIContactController.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AIContactController.m Sun Oct 17 16:09:35 2010 -0400
@@ -158,6 +158,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 7ff9edb28862 -r 613b8f4a5511 Source/AIContentController.m
--- a/Source/AIContentController.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AIContentController.m Sun Oct 17 16:09:35 2010 -0400
@@ -376,7 +376,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 7ff9edb28862 -r 613b8f4a5511 Source/AdiumMessageEvents.m
--- a/Source/AdiumMessageEvents.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AdiumMessageEvents.m Sun Oct 17 16:09:35 2010 -0400
@@ -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 7ff9edb28862 -r 613b8f4a5511 Source/AdiumPreferredAccounts.m
--- a/Source/AdiumPreferredAccounts.m Sat Oct 16 15:43:29 2010 -0500
+++ b/Source/AdiumPreferredAccounts.m Sun Oct 17 16:09:35 2010 -0400
@@ -44,7 +44,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;
More information about the commits
mailing list