Changeset 3594

Timestamp:

03/03/07 17:16:55 (1 year ago)

Author:

jmmv

Message:

Make auto-join in ICB work by handling joins when not connected and updating
the initial channel accordingly.

To make this work properly, move all initialization code from _didConnect
to _willConnect in the connections controller so that it is run before the
connection is made. The chat protocols enqueue the commands and rerun them
in the right order once connected (doing any necessary processing, as is
the case of ICB). Per timothy@'s suggestion.

Files:

• trunk/Chat Core/MVICBChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVICBChatConnection.m (modified) (1 diff)
• trunk/Controllers/MVConnectionsController.m (modified) (2 diffs)

trunk/Chat Core/MVICBChatConnection.h

@@ -78 +78 @@
-- (unsigned short) serverPort;
-- (void) sendRawMessage:(id) raw immediately:(BOOL) now;
+- (void) joinChatRoomsNamed:(NSArray *) rooms;
-- (void) joinChatRoomNamed:(NSString *) room withPassphrase:
-                           (NSString *) passphrase;

trunk/Chat Core/MVICBChatConnection.m

@@ -314 +314 @@
-}
-
+- (void) joinChatRoomsNamed:(NSArray *) rooms {
+        NSParameterAssert( rooms != nil );
+
+        if( ! [rooms count] )
+                return;
+
+        NSEnumerator *enumerator = [rooms objectEnumerator];
+        NSString *room = nil;
+
+        while( ( room = [enumerator nextObject] ) ) {
+                if( [room length] ) {
+                        [self joinChatRoomNamed:room withPassphrase:nil];
+                        break;
+                }
+        }
+}
+
-- (void) joinChatRoomNamed:(NSString *) name
-                        withPassphrase:(NSString *) passphrase {
-
+
+
+
+
-}
-

trunk/Controllers/MVConnectionsController.m

@@ -1857 +1857 @@
-- (void) _willConnect:(NSNotification *) notification {
-        MVChatConnection *connection = [notification object];
+
-        if( [self showConsoleOnConnectForConnection:connection] )
-                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO];
-
-
-
-
+
-        NSArray *rooms = [self joinRoomsForConnection:connection];
-        NSString *strcommands = [self connectCommandsForConnection:connection];
@@ -1908 +1906 @@
-        if( [rooms count] && ! ( [[[NSApplication sharedApplication] currentEvent] modifierFlags] & NSShiftKeyMask ) )
-                [connection joinChatRoomsNamed:rooms];
-
+
+
+
+
-        NSMutableDictionary *context = [NSMutableDictionary dictionary];
-        [context setObject:NSLocalizedString( @"Connected", "connected bubble title" ) forKey:@"title"];