Changeset 18363

Timestamp:

12/07/2006 03:10:05 PM (2 years ago)

Author:

evands

Message:

• Fix libgaim-oscar direct IM message queuing (which manages waiting until a direct IM is established before sending images). DIM here works great in some informal testing...
  
• Display many, many informative messages originating in libgaim which we were previously simply dropping. These aren't localized at present -- starting at a later date we'll need to work to compile such messages and make them localizable -- but something is far better than nothing. Such messages include direct IM connection status, group chat join/kick notifications, MSN notifications when a contact with whom you are conversing adds you to their list, notification of MSN nudges (refs #767, which is way too broad a ticket in scope and should be split up into individual requests), Jabber group chat topic change notifications, and many more. All this with 4 lines of code. :)
  
  

Files:

• trunk/Plugins/Gaim Service/adiumGaimConversation.m (modified) (3 diffs)
• trunk/Plugins/Gaim Service/ESGaimAIMAccount.m (modified) (3 diffs)

trunk/Plugins/Gaim Service/adiumGaimConversation.m

@@ -21 +21 @@
-#import <Adium/AIHTMLDecoder.h>
-#import <Adium/AIListContact.h>
+#import <Adium/AIContentControllerProtocol.h>
-
-#pragma mark Gaim Images
@@ -151 +152 @@
-                                } else if ([messageString rangeOfString:@"closed the conversation"].location != NSNotFound) {
-                                        updateType = AIChatClosedWindow;
+                                } else if ([messageString rangeOfString:@"Direct IM established"].location != NSNotFound) {
+                                        //Should reorganize.. this is silly, grafted on top of the previous system which added a signal to Gaim
+                                        [accountLookup(conv->account) updateContact:[chat listObject]
+                                                                                                           forEvent:[NSNumber numberWithInt:GAIM_BUDDY_DIRECTIM_CONNECTED]];
+
+                                } else if (([messageString rangeOfString:@"The remote user has closed the connection."].location != NSNotFound) ||
+                                                   ([messageString rangeOfString:@"The remote user has declined your request."].location != NSNotFound) ||
+                                                   ([messageString rangeOfString:@"Lost connection with the remote user:"].location != NSNotFound) ||
+                                                   ([messageString rangeOfString:@"Received invalid data on connection with remote user"].location != NSNotFound) ||
+                                                   ([messageString rangeOfString:@"Could not establish a connection with the remote user."].location != NSNotFound)) {
+                                        //Display the message if it's not just the one for the other guy closing it...note that this needs to be localized
+                                        if ([messageString rangeOfString:@"The remote user has closed the connection."].location == NSNotFound) {
+                                                [[[AIObject sharedAdiumInstance] contentController] displayEvent:messageString
+                                                                                                                                                                  ofType:@"directIMDisconnected"
+                                                                                                                                                                  inChat:chat];
+                                        }
+                                        
+                                        [accountLookup(conv->account) updateContact:[chat listObject]
+                                                                                                           forEvent:[NSNumber numberWithInt:GAIM_BUDDY_DIRECTIM_DISCONNECTED]]; 
-                                }
-
@@ -156 +176 @@
-                                        [accountLookup(conv->account) updateForChat:chat
-                                                                                                                   type:[NSNumber numberWithInt:updateType]];
-
+
+
+
+
+
+
-                        }
-                } else if (flags & GAIM_MESSAGE_ERROR) {

trunk/Plugins/Gaim Service/ESGaimAIMAccount.m

@@ -222 +222 @@
-                                conn = peer_connection_find_by_type(od, who, OSCAR_CAPABILITY_DIRECTIM);
-                                
+                                returnString = [self stringByProcessingImgTagsForDirectIM:returnString];
+
-                                if ((conn != NULL) && (conn->ready)) {
-
-
+
-                                        
-                                } else {
@@ -242 +243 @@
-                                        
-                                        [thisContactQueue addObject:inContentMessage];
-                                        
-                                        //Return nil for now to indicate that the message should not be sent
-                                        returnString = nil;
-                                }
-                        }
@@ -283 +281 @@
-                return NO;
-        }
+}
+
+- (BOOL)sendMessageObject:(AIContentMessage *)inContentMessage
+{
+        if (directIMQueue) {
+                NSMutableArray  *thisContactQueue = [directIMQueue objectForKey:[[inContentMessage destination] internalObjectID]];
+                if ([thisContactQueue containsObject:inContentMessage]) {
+                        //This message is in our queue of messages to send...
+                        PeerConnection  *conn;
+                        OscarData               *od = (OscarData *)account->gc->proto_data;
+                        const char              *who = [[[inContentMessage destination] UID] UTF8String];
+                        
+                        conn = peer_connection_find_by_type(od, who, OSCAR_CAPABILITY_DIRECTIM);
+                        
+                        if ((conn != NULL) && (conn->ready)) {
+                                //We have a connected dim ready; send it!  We already displayed it, though, so don't do that.
+                                [inContentMessage setDisplayContent:NO];
+                                return [super sendMessageObject:inContentMessage];
+                        } else {
+                                //Don't send now, as we'll do the actual send when the dim is connected, in directIMConnected: above, and return here.
+                                return YES;                             
+                        }
+                }
+        }
+
+        return [super sendMessageObject:inContentMessage];
-}
-