Changeset 3582

Timestamp:

02/18/07 16:02:02 (2 years ago)

Author:

timothy

Message:

Adds ICB (Internet Citizen's Band) protocol support. Implemented by Julio M. Merino Vidal (jmmv).

Files:

• trunk/Chat Core.exp (modified) (1 diff)
• trunk/Chat Core.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/Chat Core/ICBPacket.h (added)
• trunk/Chat Core/ICBPacket.m (added)
• trunk/Chat Core/MVChatConnection.h (modified) (3 diffs)
• trunk/Chat Core/MVChatConnection.m (modified) (5 diffs)
• trunk/Chat Core/MVICBChatConnection.h (added)
• trunk/Chat Core/MVICBChatConnection.m (added)
• trunk/Chat Core/MVICBChatRoom.h (added)
• trunk/Chat Core/MVICBChatRoom.m (added)
• trunk/Chat Core/MVICBChatUser.h (added)
• trunk/Chat Core/MVICBChatUser.m (added)
• trunk/Controllers/JVChatController.m (modified) (2 diffs)
• trunk/Controllers/MVConnectionsController.m (modified) (8 diffs)
• trunk/Languages/Dutch.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/Dutch.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/English.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/English.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/French.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/French.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/German.lproj/MVConnections.nib/info.nib (modified) (1 diff)
• trunk/Languages/German.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/Italian.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/Italian.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/Spanish.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/Spanish.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/pt_PT.lproj/MVConnections.nib/info.nib (modified) (2 diffs)
• trunk/Languages/pt_PT.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Languages/zh_TW.lproj/MVConnections.nib/info.nib (modified) (1 diff)
• trunk/Languages/zh_TW.lproj/MVConnections.nib/keyedobjects.nib (modified) (previous)
• trunk/Panels/JVChatConsolePanel.m (modified) (2 diffs)

trunk/Chat Core.exp

@@ -15 +15 @@
-_MVChatConnectionErrorNotification
-_MVChatConnectionGotBeepNotification
+_MVChatConnectionGotImportantMessageNotification
+_MVChatConnectionGotInformationalMessageNotification
-_MVChatConnectionGotPrivateMessageNotification
-_MVChatConnectionGotRawMessageNotification

trunk/Chat Core.xcodeproj/project.pbxproj

@@ -66 +66 @@
-                1CF6B82E07122672008ABEFA /* MVSILCChatRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6B4970710894D008ABEFA /* MVSILCChatRoom.m */; };
-                1CF6B82F07122673008ABEFA /* MVSILCChatUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6B4990710894D008ABEFA /* MVSILCChatUser.m */; };
+                322F54D10B53F6730023AE39 /* ICBPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 322F54CF0B53F6730023AE39 /* ICBPacket.h */; };
+                322F54D20B53F6730023AE39 /* ICBPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 322F54D00B53F6730023AE39 /* ICBPacket.m */; };
+                325F167E0B39A22C008C627B /* MVICBChatConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 325F167C0B39A22C008C627B /* MVICBChatConnection.h */; };
+                325F167F0B39A22C008C627B /* MVICBChatConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 325F167D0B39A22C008C627B /* MVICBChatConnection.m */; };
+                3272C2C90B3DA84900DF650E /* MVICBChatRoom.h in Headers */ = {isa = PBXBuildFile; fileRef = 3272C2C70B3DA84900DF650E /* MVICBChatRoom.h */; };
+                3272C2CA0B3DA84900DF650E /* MVICBChatRoom.m in Sources */ = {isa = PBXBuildFile; fileRef = 3272C2C80B3DA84900DF650E /* MVICBChatRoom.m */; };
+                32C46E1A0B3AB37E00B96B27 /* MVICBChatUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 32C46E180B3AB37E00B96B27 /* MVICBChatUser.h */; };
+                32C46E1B0B3AB37E00B96B27 /* MVICBChatUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 32C46E190B3AB37E00B96B27 /* MVICBChatUser.m */; };
-                431261C3072EE37A00720AD1 /* MVSILCFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 431261C1072EE37A00720AD1 /* MVSILCFileTransfer.m */; };
-/* End PBXBuildFile section */
@@ -143 +151 @@
-                1CF6B4980710894D008ABEFA /* MVSILCChatUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVSILCChatUser.h; path = "Chat Core/MVSILCChatUser.h"; sourceTree = "<group>"; };
-                1CF6B4990710894D008ABEFA /* MVSILCChatUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVSILCChatUser.m; path = "Chat Core/MVSILCChatUser.m"; sourceTree = "<group>"; };
+                322F54CF0B53F6730023AE39 /* ICBPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ICBPacket.h; path = "Chat Core/ICBPacket.h"; sourceTree = "<group>"; };
+                322F54D00B53F6730023AE39 /* ICBPacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ICBPacket.m; path = "Chat Core/ICBPacket.m"; sourceTree = "<group>"; };
+                325F167C0B39A22C008C627B /* MVICBChatConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVICBChatConnection.h; path = "Chat Core/MVICBChatConnection.h"; sourceTree = "<group>"; };
+                325F167D0B39A22C008C627B /* MVICBChatConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVICBChatConnection.m; path = "Chat Core/MVICBChatConnection.m"; sourceTree = "<group>"; };
+                3272C2C70B3DA84900DF650E /* MVICBChatRoom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVICBChatRoom.h; path = "Chat Core/MVICBChatRoom.h"; sourceTree = "<group>"; };
+                3272C2C80B3DA84900DF650E /* MVICBChatRoom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVICBChatRoom.m; path = "Chat Core/MVICBChatRoom.m"; sourceTree = "<group>"; };
+                32C46E180B3AB37E00B96B27 /* MVICBChatUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVICBChatUser.h; path = "Chat Core/MVICBChatUser.h"; sourceTree = "<group>"; };
+                32C46E190B3AB37E00B96B27 /* MVICBChatUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVICBChatUser.m; path = "Chat Core/MVICBChatUser.m"; sourceTree = "<group>"; };
-                431261C0072EE37A00720AD1 /* MVSILCFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MVSILCFileTransfer.h; path = "Chat Core/MVSILCFileTransfer.h"; sourceTree = "<group>"; };
-                431261C1072EE37A00720AD1 /* MVSILCFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MVSILCFileTransfer.m; path = "Chat Core/MVSILCFileTransfer.m"; sourceTree = "<group>"; };
@@ -261 +277 @@
-                        sourceTree = "<group>";
-                };
+                32C46E1F0B3AB3BC00B96B27 /* ICB Support */ = {
+                        isa = PBXGroup;
+                        children = (
+                                322F54CF0B53F6730023AE39 /* ICBPacket.h */,
+                                322F54D00B53F6730023AE39 /* ICBPacket.m */,
+                                325F167C0B39A22C008C627B /* MVICBChatConnection.h */,
+                                325F167D0B39A22C008C627B /* MVICBChatConnection.m */,
+                                3272C2C70B3DA84900DF650E /* MVICBChatRoom.h */,
+                                3272C2C80B3DA84900DF650E /* MVICBChatRoom.m */,
+                                32C46E180B3AB37E00B96B27 /* MVICBChatUser.h */,
+                                32C46E190B3AB37E00B96B27 /* MVICBChatUser.m */,
+                        );
+                        name = "ICB Support";
+                        sourceTree = "<group>";
+                };
-                F50B0A9F0170C89301A84BDE /* Sources & Headers */ = {
-                        isa = PBXGroup;
-                        children = (
+                                32C46E1F0B3AB3BC00B96B27 /* ICB Support */,
-                                1C5CBF2D06FF92C90006C5B1 /* IRC Support */,
-                                1C5CBF3006FF93550006C5B1 /* SILC Support */,
@@ -364 +396 @@
-                                1C3560060B4CCE95008A93FA /* MVUtilities.h in Headers */,
-                                1C5A491E0B50B7C000BC8CAD /* MVDirectChatConnection.h in Headers */,
+                                325F167E0B39A22C008C627B /* MVICBChatConnection.h in Headers */,
+                                32C46E1A0B3AB37E00B96B27 /* MVICBChatUser.h in Headers */,
+                                3272C2C90B3DA84900DF650E /* MVICBChatRoom.h in Headers */,
+                                322F54D10B53F6730023AE39 /* ICBPacket.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -490 +526 @@
-                                1C0FE8AB0B4F647D00855B9C /* MVDirectClientConnection.m in Sources */,
-                                1C9C133A0B50A7AC005F9F28 /* MVDirectChatConnection.m in Sources */,
+                                325F167F0B39A22C008C627B /* MVICBChatConnection.m in Sources */,
+                                32C46E1B0B3AB37E00B96B27 /* MVICBChatUser.m in Sources */,
+                                3272C2CA0B3DA84900DF650E /* MVICBChatRoom.m in Sources */,
+                                322F54D20B53F6730023AE39 /* ICBPacket.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Chat Core/MVChatConnection.h

@@ -1 +1 @@
-typedef enum {
+        MVChatConnectionICBType = 'icbC',
-        MVChatConnectionIRCType = 'ircC',
-        MVChatConnectionSILCType = 'silC'
@@ -46 +47 @@
-        MVChatConnectionErroneusNicknameError = -12,
-        MVChatConnectionBannedFromServerError = -13,
-
+
+
-} MVChatConnectionError;
-
@@ -66 +68 @@
-
-extern NSString *MVChatConnectionGotBeepNotification;
+extern NSString *MVChatConnectionGotImportantMessageNotification;
+extern NSString *MVChatConnectionGotInformationalMessageNotification;
-extern NSString *MVChatConnectionGotRawMessageNotification;
-extern NSString *MVChatConnectionGotPrivateMessageNotification;

trunk/Chat Core/MVChatConnection.m

@@ -4 +4 @@
-#import "MVChatUser.h"
-#import "MVChatUserPrivate.h"
+#import "MVICBChatConnection.h"
-#import "MVIRCChatConnection.h"
-#import "MVSILCChatConnection.h"
@@ -28 +29 @@
-
-NSString *MVChatConnectionGotBeepNotification = @"MVChatConnectionGotBeepNotification";
+NSString *MVChatConnectionGotImportantMessageNotification = @"MVChatConnectionGotInformationalMessageNotification";
+NSString *MVChatConnectionGotInformationalMessageNotification = @"MVChatConnectionGotInformationalMessageNotification";
-NSString *MVChatConnectionGotRawMessageNotification = @"MVChatConnectionGotRawMessageNotification";
-NSString *MVChatConnectionGotPrivateMessageNotification = @"MVChatConnectionGotPrivateMessageNotification";
@@ -54 +57 @@
-+ (BOOL) supportsURLScheme:(NSString *) scheme {
-        if( ! scheme ) return NO;
-
+cb"] || [scheme isEqualToString:@"i
-}
-
-+ (NSArray *) defaultServerPortsForType:(MVChatConnectionType) type {
-
+
+
-        else if( type == MVChatConnectionSILCType ) return [MVSILCChatConnection defaultServerPorts];
-        return nil;
@@ -96 +100 @@
-        [self release];
-
-
+
+
+
-                self = [[MVIRCChatConnection allocWithZone:nil] init];
-        } else if ( connectionType == MVChatConnectionSILCType ) {
@@ -109 +115 @@
-
-        int connectionType = 0;
-
+
+
-        else if( [[serverURL scheme] isEqualToString:@"silc"] ) connectionType = MVChatConnectionSILCType;
-

trunk/Controllers/JVChatController.m

@@ -638 +638 @@
-- (void) _errorOccurred:(NSNotification *) notification {
-        NSError *error = [[notification userInfo] objectForKey:@"error"];
-
+
+
+
+
+
+
+
+
-                MVChatUser *user = [[error userInfo] objectForKey:@"user"];
-                JVDirectChatPanel *panel = [self chatViewControllerForUser:user ifExists:YES];
@@ -648 +655 @@
-                        [alert runModal];
-                }
+        } else if( [error code] == MVChatConnectionProtocolError ) {
+                NSString *reason = [[error userInfo] objectForKey:@"reason"];
+                NSAlert *alert = [[[NSAlert alloc] init] autorelease];
+                [alert setMessageText:[NSString stringWithFormat:NSLocalizedString( @"Chat protocol error", "malformed packet alert dialog title" )]];
+                [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString( @"Client got a malformed packet: %@", "malformd packet alert dialog message" ), reason]];
+                [alert setAlertStyle:NSInformationalAlertStyle];
+                [alert runModal];
-        }
-}

trunk/Controllers/MVConnectionsController.m

@@ -109 +109 @@
-#pragma mark -
-
+- (MVChatConnectionType) newTypeToConnectionType {
+        MVChatConnectionType type;
+        switch( [[newType selectedItem] tag] ) {
+        case 0:
+                type = MVChatConnectionICBType;
+                break;
+        case 1:
+                type = MVChatConnectionIRCType;
+                break;
+        case 2:
+                type = MVChatConnectionSILCType;
+                break;
+        default:
+                NSAssert(NO, @"Unsupported tag type\n");
+                type = nil;
+        }
+        return type;
+}
+
-- (id) initWithWindowNibName:(NSString *) windowNibName {
-        if( ( self = [super initWithWindowNibName:@"MVConnections"] ) ) {
@@ -275 +294 @@
-        [newServerPassword setObjectValue:@""];
-
-( [[newType selectedItem] tag] == 1 ? MVChatConnectionIRCType : MVChatConnectionSILCType )
+[self newTypeToConnectionType]
-        if( [[MVChatConnection defaultServerPortsForType:type] count] )
-                [newPort setObjectValue:[[MVChatConnection defaultServerPortsForType:type] objectAtIndex:0]];
@@ -284 +303 @@
-
-- (IBAction) changeNewConnectionProtocol:(id) sender {
-( [[newType selectedItem] tag] == 1 ? MVChatConnectionIRCType : MVChatConnectionSILCType )
+[self newTypeToConnectionType]
-
-        [newPort reloadData];
@@ -290 +309 @@
-                [newPort setObjectValue:[[MVChatConnection defaultServerPortsForType:type] objectAtIndex:0]];
-
-
+
+
+
+
-                [sslConnection setEnabled:YES];
-                [newProxy setEnabled:YES];
@@ -397 +419 @@
-        [openConnection orderOut:nil];
-
-( [[newType selectedItem] tag] == 1 ? MVChatConnectionIRCType : MVChatConnectionSILCType )
+[self newTypeToConnectionType]
-
-        MVChatConnection *connection = [[[MVChatConnection alloc] initWithType:type] autorelease];
@@ -1295 +1317 @@
-                return [[[NSUserDefaults standardUserDefaults] arrayForKey:@"JVChatServers"] count];
-        } else if( comboBox == newPort ) {
-( [[newType selectedItem] tag] == 1 ? MVChatConnectionIRCType : MVChatConnectionSILCType )
+[self newTypeToConnectionType]
-                return [[MVChatConnection defaultServerPortsForType:type] count];
-        }
@@ -1306 +1328 @@
-                return [[[NSUserDefaults standardUserDefaults] arrayForKey:@"JVChatServers"] objectAtIndex:index];
-        } else if( comboBox == newPort ) {
-( [[newType selectedItem] tag] == 1 ? MVChatConnectionIRCType : MVChatConnectionSILCType )
+[self newTypeToConnectionType]
-                return [[MVChatConnection defaultServerPortsForType:type] objectAtIndex:index];
-        }
@@ -1614 +1636 @@
-
-                MVChatConnection *connection = nil;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                if( [info objectForKey:@"url"] ) {

trunk/Languages/Dutch.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-39
+54
-        <key>IBGroupedObjects</key>
-        <dict>
@@ -31 +31 @@
-        </array>
-        <key>IBSystem Version</key>
-8C46
+9A321
-</dict>
-</plist>

trunk/Languages/English.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-39
+54
-        <key>IBGroupedObjects</key>
-        <dict>
@@ -28 +28 @@
-        <key>IBOpenObjects</key>
-        <array>
-
-
+
-        </array>
-        <key>IBSystem Version</key>
-8C46
+9A321
-</dict>
-</plist>

trunk/Languages/French.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-39
+54
-        <key>IBGroupedObjects</key>
-        <dict>
@@ -34 +34 @@
-        <key>IBOpenObjects</key>
-        <array>
-776
+267
-        </array>
-        <key>IBSystem Version</key>
-8F46
+9A321
-</dict>
-</plist>

trunk/Languages/German.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-46.1
+54.0
-        <key>IBLockedObjects</key>
-        <array>
-                <integer>5</integer>
-        </array>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>267</integer>
+        </array>
-        <key>IBSystem Version</key>
-8L2127
+9A321
-</dict>
-</plist>

trunk/Languages/Italian.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-46.1
+54.0
-        <key>IBLockedObjects</key>
-        <array>
@@ -19 +19 @@
-        <array>
-                <integer>267</integer>
-                <integer>776</integer>
-        </array>
-        <key>IBSystem Version</key>
-8J2135a
+9A321
-</dict>
-</plist>

trunk/Languages/Spanish.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 75 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-46.1
+54.0
-        <key>IBGroupedObjects</key>
-        <dict>
@@ -26 +26 @@
-                <integer>5</integer>
-        </array>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>267</integer>
+        </array>
-        <key>IBSystem Version</key>
-8L2127
+9A321
-</dict>
-</plist>

trunk/Languages/pt_PT.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-43
+54
-        <key>IBGroupedObjects</key>
-        <dict>
@@ -34 +34 @@
-        <key>IBOpenObjects</key>
-        <array>
-776
+267
-        </array>
-        <key>IBSystem Version</key>
-8F46
+9A321
-</dict>
-</plist>

trunk/Languages/zh_TW.lproj/MVConnections.nib/info.nib

@@ -6 +6 @@
-        <string>39 73 381 300 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-43
+54
-        <key>IBLockedObjects</key>
-        <array>
-                <integer>5</integer>
-        </array>
+        <key>IBOpenObjects</key>
+        <array>
+                <integer>267</integer>
+        </array>
-        <key>IBSystem Version</key>
-8F46
+9A321
-</dict>
-</plist>

trunk/Panels/JVChatConsolePanel.m

@@ -23 +23 @@
-                _ignorePRIVMSG = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatConsolePanelIgnoreUserChatMessages"];
-
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotImportantMessage: ) name:MVChatConnectionGotImportantMessageNotification object:connection];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotInformationalMessage: ) name:MVChatConnectionGotInformationalMessageNotification object:connection];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotRawMessage: ) name:MVChatConnectionGotRawMessageNotification object:connection];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( clearConsole: ) name:MVChatConnectionWillConnectNotification object:connection];
@@ -647 +649 @@
-
-@implementation JVChatConsolePanel (JVChatConsolePanelPrivate)
+- (void) _gotImportantMessage:(NSNotification *) notification {
+        if( _paused ) return;
+        [self addMessageToDisplay:[[notification userInfo] objectForKey:@"message"] asOutboundMessage:NO];
+}
+
+- (void) _gotInformationalMessage:(NSNotification *) notification {
+        if( _paused ) return;
+        [self addMessageToDisplay:[[notification userInfo] objectForKey:@"message"] asOutboundMessage:NO];
+}
+
-- (void) _gotRawMessage:(NSNotification *) notification {
-        if( _paused ) return;