Changeset 25543

Timestamp:

11/07/2008 11:00:20 AM (2 months ago)

Author:

evands

Message:

Allow the account to prevent sending an autoreply to a message. This moves some OSCAR-specific code to CBPurpleOscarAccount from AIAutoReplyPlugin and fixes IRC sending autoreplies to the connection bots.

Files:

• trunk/Frameworks/Adium Framework/Source/AIAccount.h (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIAccount.m (modified) (1 diff)
• trunk/Plugins/Purple Service/CBPurpleOscarAccount.m (modified) (1 diff)
• trunk/Plugins/Purple Service/ESIRCAccount.m (modified) (1 diff)
• trunk/Source/AIAutoReplyPlugin.m (modified) (2 diffs)

trunk/Frameworks/Adium Framework/Source/AIAccount.h

@@ -225 +225 @@
-- (NSString *)encodedAttributedStringForSendingContentMessage:(AIContentMessage *)inContentMessage;
-- (BOOL)rejoinChat:(AIChat*)chat;
+/*!
+ * @brief Should an autoreply be sent to this message?
+ *
+ * This will only be called if the generic algorithm determines that an autoreply is appropriate. The account
+ * gets an opportunity to suppress sending the autoreply, e.g. on the basis of the message's content or source.
+ */
+- (BOOL)shouldSendAutoreplyToMessage:(AIContentMessage *)message;
-
-//Presence Tracking

trunk/Frameworks/Adium Framework/Source/AIAccount.m

@@ -647 +647 @@
-{
-    return [self encodedAttributedString:[inContentMessage message] forListObject:[inContentMessage destination]];
+}
+
+/*!
+ * @brief Should an autoreply be sent to this message?
+ *
+ * This will only be called if the generic algorithm determines that an autoreply is appropriate. The account
+ * gets an opportunity to suppress sending the autoreply, e.g. on the basis of the message's content or source.
+ */
+- (BOOL)shouldSendAutoreplyToMessage:(AIContentMessage *)message
+{
+        return YES;
-}
-

trunk/Plugins/Purple Service/CBPurpleOscarAccount.m

@@ -513 +513 @@
-        return success;
-}
+
+- (BOOL)shouldSendAutoreplyToMessage:(AIContentMessage *)message
+{
+        return ![[message.message string] hasPrefix:@"[Offline IM sent"];
+}
+
-
-#pragma mark DirectIM (IM Image)

trunk/Plugins/Purple Service/ESIRCAccount.m

@@ -122 +122 @@
-}
-
+BOOL contactUIDIsServerContact(NSString *contactUID)
+{
+        return (([contactUID caseInsensitiveCompare:@"nickserv"] == NSOrderedSame) ||
+                        ([contactUID caseInsensitiveCompare:@"chanserv"] == NSOrderedSame) ||
+                        ([contactUID rangeOfString:@"-connect" options:(NSBackwardsSearch | NSCaseInsensitiveSearch | NSAnchoredSearch)].location != NSNotFound));
+}
+
+/*!
+ * @brief Can we send an offline message to this contact?
+ *
+ * We can only send offline messages to the server contacts, since such a message might cause us to connect
+ */
-- (BOOL)canSendOfflineMessageToContact:(AIListContact *)inContact
-{
-
-
+
+
+
+
+
+
-}
-

trunk/Source/AIAutoReplyPlugin.m

@@ -112 +112 @@
-         * was an offline message we're getting as we connect and it's older than 5 minutes
-         * (or the person sending it is no longer online) -RAF
-
-
+
-         */
-        if ([[contentObject type] isEqualToString:CONTENT_MESSAGE_TYPE] &&
@@ -120 +119 @@
-           !chat.isGroupChat &&
-                (abs([contentObject.date timeIntervalSinceNow]) < 300) &&
-!([contentObject.source.serviceClass isEqualToString:@"AIM-compatible"] && [[contentObject.message string] hasPrefix:@"[Offline IM sent"])
+[[chat account] shouldSendAutoreplyToMessage:(AIContentMessage *)contentObject]
-                //300 is 5 minutes in seconds
-