Changeset 23540

Timestamp:

05/21/2008 08:15:44 PM (6 months ago)

Author:

evands

Message:

Special case handling of services for 'to' groups and AIChatLogs to know about jabber/gtalk/livejournal and aim/icq/.mac. This isn't perfect (and the code remains really complicated), but it achieves the desired result. Fixes #9725

Files:

• trunk/Source/AIAbstractLogViewerWindowController.h (modified) (1 diff)
• trunk/Source/AIAbstractLogViewerWindowController.m (modified) (3 diffs)
• trunk/Source/AIChatLog.m (modified) (1 diff)
• trunk/Source/AILoggerPlugin.m (modified) (1 diff)
• trunk/Source/AILogToGroup.m (modified) (2 diffs)

trunk/Source/AIAbstractLogViewerWindowController.h

@@ -191 +191 @@
-
-@end
+
+NSString *handleSpecialCasesForUIDAndServiceClass(NSString *contactUID, NSString *serviceClass);

trunk/Source/AIAbstractLogViewerWindowController.m

@@ -312 +312 @@
-                NSEnumerator    *toEnum;
-                AILogToGroup    *currentToGroup;
-                NSString                *serviceClass = [logFromGroup serviceClass];
-
-                //Add the 'to' for each grouping on this account
@@ -320 +319 @@
-                        
-                        if ((currentTo = [currentToGroup to])) {
+                                NSString *serviceClass = [currentToGroup serviceClass];
-                                AIListObject *listObject = ((serviceClass && currentTo) ?
-                                                                                        [[adium contactController] existingListObjectWithUniqueID:[AIListObject internalObjectIDForServiceID:serviceClass
@@ -2719 +2719 @@
-}
-
+#pragma Transcript services special-casing
+NSString *handleSpecialCasesForUIDAndServiceClass(NSString *contactUID, NSString *serviceClass)
+{
+        /* Jabber and its specified derivative services need special handling;
+         * this is cross-contamination from ESPurpleJabberAccount.
+         */
+        if ([serviceClass isEqualToString:@"Jabber"] ||
+                [serviceClass isEqualToString:@"GTalk"] ||
+                [serviceClass isEqualToString:@"LiveJournal"]) {
+                
+                if ([contactUID hasSuffix:@"@gmail.com"] ||
+                        [contactUID hasSuffix:@"@googlemail.com"]) {
+                        serviceClass = @"GTalk";
+                        
+                } else if ([contactUID hasSuffix:@"@livejournal.com"]){
+                        serviceClass = @"LiveJournal";
+                        
+                } else {
+                        serviceClass = @"Jabber";
+                }       
+                
+                /* OSCAR and its specified derivative services need special handling;
+                 *  this is cross-contamination from CBPurpleOscarAccount.
+                 */
+        } else if ([serviceClass isEqualToString:@"AIM"] ||
+                           [serviceClass isEqualToString:@"ICQ"] ||
+                           [serviceClass isEqualToString:@"Mac"]) {
+                const char      firstCharacter = ([contactUID length] ? [contactUID characterAtIndex:0] : '\0');
+                
+                //Determine service based on UID
+                if ([contactUID hasSuffix:@"@mac.com"]) {
+                        serviceClass = @"Mac";
+                } else if (firstCharacter && (firstCharacter >= '0' && firstCharacter <= '9')) {
+                        serviceClass = @"ICQ";
+                } else {
+                        serviceClass = @"AIM";
+                }
+        }
+        
+        return serviceClass;
+}
+
-@end

trunk/Source/AIChatLog.m

@@ -50 +50 @@
-        
-        if ([serviceAndFromUIDArray count] >= 2) {
-[serviceAndFromUIDArray objectAtIndex:0]
+handleSpecialCasesForUIDAndServiceClass(toUID, [serviceAndFromUIDArray objectAtIndex:0])
-                
-                //Use substringFromIndex so we include the rest of the string in the case of a UID with a . in it

trunk/Source/AILoggerPlugin.m

@@ -1392 +1392 @@
-
-@end
-
-

trunk/Source/AILogToGroup.m

@@ -18 +18 @@
-#import "AILogToGroup.h"
-#import "AIChatLog.h"
+#import "AIAbstractLogViewerWindowController.h"
-#import <AIUtilities/AIFileManagerAdditions.h>
-
@@ -35 +36 @@
-                from = [inFrom retain];
-                to = [inTo retain];
-inServiceClass
+handleSpecialCasesForUIDAndServiceClass(to, inServiceClass)
-                logDict = nil;
-                partialLogDict = nil;