Changeset 3539

Timestamp:

01/07/07 02:39:56 (2 years ago)

Author:

timothy

Message:

Adds DCC chat support. You can start a chat by using the context menu or the /dcc chat <nick> command. #34

Files:

• trunk/Additions/NSStringAdditions.h (modified) (1 diff)
• trunk/Additions/NSStringAdditions.m (modified) (1 diff)
• trunk/Chat Core.exp (modified) (2 diffs)
• trunk/Chat Core.xcodeproj/project.pbxproj (modified) (7 diffs)
• trunk/Chat Core/ChatCore.h (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.m (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVDirectChatConnection.h (added)
• trunk/Chat Core/MVDirectChatConnection.m (added)
• trunk/Chat Core/MVDirectChatConnectionPrivate.h (added)
• trunk/Chat Core/MVDirectClientConnection.h (modified) (1 diff)
• trunk/Chat Core/MVDirectClientConnection.m (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (16 diffs)
• trunk/Chat Core/MVIRCChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVIRCFileTransfer.m (modified) (3 diffs)
• trunk/Controllers/JVChatController.h (modified) (2 diffs)
• trunk/Controllers/JVChatController.m (modified) (5 diffs)
• trunk/Panels/JVChatRoomMember.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (10 diffs)
• trunk/Panels/MVChatUserAdditions.h (modified) (1 diff)
• trunk/Panels/MVChatUserAdditions.m (modified) (3 diffs)
• trunk/Plug-Ins/Standard Commands/JVStandardCommands.m (modified) (2 diffs)

trunk/Additions/NSStringAdditions.h

@@ -6 +6 @@
-+ (unsigned long) scriptTypedEncodingFromStringEncoding:(NSStringEncoding) encoding;
-+ (NSStringEncoding) stringEncodingFromScriptTypedEncoding:(unsigned long) encoding;
+
+- (BOOL) isCaseInsensitiveEqualToString:(NSString *) string;
+- (BOOL) hasCaseInsensitivePrefix:(NSString *) prefix;
+- (BOOL) hasCaseInsensitiveSuffix:(NSString *) suffix;
+- (BOOL) hasCaseInsensitiveSubstring:(NSString *) substring;
-
-- (NSString *) stringByEncodingXMLSpecialCharactersAsEntities;

trunk/Additions/NSStringAdditions.m

@@ -212 +212 @@
-#pragma mark -
-
+- (BOOL) isCaseInsensitiveEqualToString:(NSString *) string {
+        return [self compare:string options:NSCaseInsensitiveSearch range:NSMakeRange( 0, [self length] ) locale:nil] == NSOrderedSame;
+}
+
+- (BOOL) hasCaseInsensitivePrefix:(NSString *) prefix {
+        return [self rangeOfString:prefix options:( NSCaseInsensitiveSearch | NSAnchoredSearch ) range:NSMakeRange( 0, [self length] ) locale:nil].location != NSNotFound;
+}
+
+- (BOOL) hasCaseInsensitiveSuffix:(NSString *) suffix {
+        return [self rangeOfString:suffix options:( NSCaseInsensitiveSearch | NSBackwardsSearch | NSAnchoredSearch ) range:NSMakeRange( 0, [self length] ) locale:nil].location != NSNotFound;
+}
+
+- (BOOL) hasCaseInsensitiveSubstring:(NSString *) substring {
+        return [self rangeOfString:substring options:NSCaseInsensitiveSearch range:NSMakeRange( 0, [self length] ) locale:nil].location != NSNotFound;
+}
+
+#pragma mark -
+
-- (NSString *) stringByEncodingXMLSpecialCharactersAsEntities {
-        NSMutableString *result = [self mutableCopyWithZone:nil];

trunk/Chat Core.exp

@@ -4 +4 @@
-.objc_class_name_MVChatUser
-.objc_class_name_MVChatUserWatchRule
+.objc_class_name_MVDirectChatConnection
-.objc_class_name_MVDownloadFileTransfer
-.objc_class_name_MVFileTransfer
@@ -83 +84 @@
-_MVChatUserWatchRuleMatchedNotification
-_MVChatUserWatchRuleRemovedMatchedUserNotification
+_MVDirectChatConnectionDidConnectNotification
+_MVDirectChatConnectionDidDisconnectNotification
+_MVDirectChatConnectionDidNotConnectNotification
+_MVDirectChatConnectionErrorDomain
+_MVDirectChatConnectionErrorOccurredNotification
+_MVDirectChatConnectionGotMessageNotification
+_MVDirectChatConnectionOfferNotification
-_MVDownloadFileTransferOfferNotification
-_MVFileTransferErrorDomain

trunk/Chat Core.xcodeproj/project.pbxproj

@@ -20 +20 @@
-                1C5A233F06FA4FEE00A51F10 /* libsilc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C5A233D06FA4FEE00A51F10 /* libsilc.framework */; };
-                1C5A234006FA4FEE00A51F10 /* libsilcclient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C5A233E06FA4FEE00A51F10 /* libsilcclient.framework */; };
+                1C5A491E0B50B7C000BC8CAD /* MVDirectChatConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C9C13370B50A7AC005F9F28 /* MVDirectChatConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1C63E9ED086E59D700A40DD4 /* ChatCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C63E9EC086E59D700A40DD4 /* ChatCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1C668DBA07BF9C4C008400F7 /* NSScannerAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C668DB807BF9C4C008400F7 /* NSScannerAdditions.m */; };
@@ -44 +45 @@
-                1C943AAB063C260800618CD9 /* MVFileTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C943AA9063C260800618CD9 /* MVFileTransfer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1C943AAC063C260800618CD9 /* MVFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C943AAA063C260800618CD9 /* MVFileTransfer.m */; };
+                1C9C133A0B50A7AC005F9F28 /* MVDirectChatConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C9C13380B50A7AC005F9F28 /* MVDirectChatConnection.m */; };
-                1C9CF4FE0615091400330D8D /* MVChatPluginManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1C9CF4FF0615091500330D8D /* MVChatPluginManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C2EF7EC0427A40B00000102 /* MVChatPluginManager.m */; };
@@ -115 +117 @@
-                1C943AAA063C260800618CD9 /* MVFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVFileTransfer.m; path = "Chat Core/MVFileTransfer.m"; sourceTree = "<group>"; };
-                1C9AE8E0086A5218008ED7AD /* Common Settings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "Common Settings.xcconfig"; path = "Settings/Common Settings.xcconfig"; sourceTree = "<group>"; };
+                1C9C13370B50A7AC005F9F28 /* MVDirectChatConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVDirectChatConnection.h; path = "Chat Core/MVDirectChatConnection.h"; sourceTree = "<group>"; };
+                1C9C13380B50A7AC005F9F28 /* MVDirectChatConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVDirectChatConnection.m; path = "Chat Core/MVDirectChatConnection.m"; sourceTree = "<group>"; };
+                1C9C14170B50B3AB005F9F28 /* MVDirectChatConnectionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVDirectChatConnectionPrivate.h; path = "Chat Core/MVDirectChatConnectionPrivate.h"; sourceTree = "<group>"; };
-                1CCA517E0598AFBA00F0A4CD /* ChatCore.scriptSuite */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = ChatCore.scriptSuite; path = Resources/ChatCore.scriptSuite; sourceTree = "<group>"; };
-                1CCA517F0598AFBA00F0A4CD /* ChatCore.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = ChatCore.scriptTerminology; path = Resources/ChatCore.scriptTerminology; sourceTree = "<group>"; };
@@ -220 +225 @@
-                                1C74433B06FE3AB3009AA696 /* MVIRCFileTransfer.m */,
-                                1C74433A06FE3AB3009AA696 /* MVIRCFileTransfer.h */,
-                                1C0FE8A90B4F647D00855B9C /* MVDirectClientConnection.m */,
-                                1C0FE8A80B4F647D00855B9C /* MVDirectClientConnection.h */,
-                                1CD62AA10962114500BD1DD2 /* MVIRCNumerics.h */,
-                        );
@@ -278 +281 @@
-                                1C943AA9063C260800618CD9 /* MVFileTransfer.h */,
-                                1CE4632E095ECDE600AB7732 /* MVFileTransferPrivate.h */,
+                                1C0FE8A90B4F647D00855B9C /* MVDirectClientConnection.m */,
+                                1C0FE8A80B4F647D00855B9C /* MVDirectClientConnection.h */,
+                                1C9C13380B50A7AC005F9F28 /* MVDirectChatConnection.m */,
+                                1C9C13370B50A7AC005F9F28 /* MVDirectChatConnection.h */,
+                                1C9C14170B50B3AB005F9F28 /* MVDirectChatConnectionPrivate.h */,
-                                1C2EF7EC0427A40B00000102 /* MVChatPluginManager.m */,
-                                1C2EF7EB0427A40B00000102 /* MVChatPluginManager.h */,
@@ -355 +363 @@
-                                1C8AAEFE09D69F2700CF29EB /* MVChatUserWatchRule.h in Headers */,
-                                1C3560060B4CCE95008A93FA /* MVUtilities.h in Headers */,
+                                1C5A491E0B50B7C000BC8CAD /* MVDirectChatConnection.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -480 +489 @@
-                                1C8AAEFF09D69F2700CF29EB /* MVChatUserWatchRule.m in Sources */,
-                                1C0FE8AB0B4F647D00855B9C /* MVDirectClientConnection.m in Sources */,
+                                1C9C133A0B50A7AC005F9F28 /* MVDirectChatConnection.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Chat Core/ChatCore.h

@@ -6 +6 @@
-#import <ChatCore/MVChatUserWatchRule.h>
-#import <ChatCore/MVFileTransfer.h>
+#import <ChatCore/MVDirectChatConnection.h>
-#import <ChatCore/MVChatPluginManager.h>
-

trunk/Chat Core/MVChatConnection.m

@@ -1024 +1024 @@
-
-        while( ( user = [enumerator nextObject] ) )
-caseInsensitiveCompare:name] == NSOrderedSame
+isCaseInsensitiveEqualToString:name]
-                        return user;
-

trunk/Chat Core/MVChatRoom.m

@@ -669 +669 @@
-
-        while( ( user = [enumerator nextObject] ) )
-caseInsensitiveCompare:memberName] == NSOrderedSame
+isCaseInsensitiveEqualToString:memberName]
-                        return user;
-

trunk/Chat Core/MVDirectClientConnection.h

@@ -2 +2 @@
-
-@class AsyncSocket;
+
+NSString *MVDCCFriendlyAddress( NSString *address );
-
-@interface MVDirectClientConnection : NSObject {

trunk/Chat Core/MVDirectClientConnection.m

@@ -5 +5 @@
-#import "MVFileTransfer.h"
-#import "MVUtilities.h"
+
+#import <arpa/inet.h>
+
+NSString *MVDCCFriendlyAddress( NSString *address ) {
+        NSURL *url = [NSURL URLWithString:@"http://colloquy.info/ip.php"];
+        NSURLRequest *request = [NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:3.];
+        NSData *result = [NSURLConnection sendSynchronousRequest:request returningResponse:NULL error:NULL];
+        if( [result length] >= 6 && [result length] <= 40 ) // should be a valid IPv4 or IPv6 address
+                address = [[[NSString allocWithZone:nil] initWithData:result encoding:NSASCIIStringEncoding] autorelease];
+
+        if( [address rangeOfString:@"."].location != NSNotFound )
+                return [NSString stringWithFormat:@"%lu", ntohl( inet_addr( [address UTF8String] ) )];
+        return address;
+}
-
-static int natTraversalStatus( tr_upnp_t *upnp, tr_natpmp_t *natpmp ) {

trunk/Chat Core/MVIRCChatConnection.m

@@ -4 +4 @@
-#import "MVIRCFileTransfer.h"
-#import "MVIRCNumerics.h"
+#import "MVDirectChatConnectionPrivate.h"
-
-#import "AsyncSocket.h"
@@ -1507 +1508 @@
-                                        NSString *msg = [self _newStringWithBytes:[msgData bytes] length:[msgData length]];
-
-rangeOfString:@"NickServ"].location != NSNotFound && [msg rangeOfString:@"IDENTIFY"].location != NSNotFound
+hasCaseInsensitiveSubstring:@"NickServ"] && [msg hasCaseInsensitiveSubstring:@"IDENTIFY"]
-                                                if( ! [self nicknamePassword] ) {
-                                                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionNeedNicknamePasswordNotification object:self userInfo:nil];
-                                                } else [self sendRawMessageImmediatelyWithFormat:@"NickServ IDENTIFY %@", [self nicknamePassword]];
-rangeOfString:@"Password accepted"].location != NSNotFound
+hasCaseInsensitiveSubstring:@"password accepted"]
-                                                [[self localUser] _setIdentified:YES];
-rangeOfString:@"authentication required"].location != NSNotFound
+hasCaseInsensitiveSubstring:@"authentication required"] || [msg hasCaseInsensitiveSubstring:@"nickname is owned"]
-                                                [[self localUser] _setIdentified:NO];
-                                        }
@@ -1539 +1540 @@
-
-        NSString *command = [self _newStringWithBytes:current length:(line - current)];
-Mutable
+
-        if( line != end ) {
-                line++;
-Mutable
-
-
-caseInsensitiveCompare:@"ACTION"] == NSOrderedSame
+
+
+
+isCaseInsensitiveEqualToString:@"ACTION"]
-                // special case ACTION and send it out like a message with the action flag
-                if( room ) [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomGotMessageNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", arguments, @"message", [NSString locallyUniqueString], @"identifier", [NSNumber numberWithBool:YES], @"action", nil]];
@@ -1574 +1575 @@
-
-        if( request ) {
-caseInsensitiveCompare:@"VERSION"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"VERSION"]
-                        NSDictionary *systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/ServerVersion.plist"];
-                        if( ! [systemVersion count] ) systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
@@ -1592 +1593 @@
-                        [reply release];
-                        [systemVersion release];
-caseInsensitiveCompare:@"TIME"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"TIME"]
-                        [sender sendSubcodeReply:command withArguments:[[NSDate date] description]];
-caseInsensitiveCompare:@"PING"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"PING"]
-                        // only reply with packets less than 100 bytes, anything over that is bad karma
-                        if( [arguments length] < 100 ) [sender sendSubcodeReply:command withArguments:arguments];
-caseInsensitiveCompare:@"DCC"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"DCC"]
-                        NSString *msg = [self _newStringWithBytes:[arguments bytes] length:[arguments length]];
-                        NSString *subCommand = nil;
@@ -1614 +1615 @@
-                        }
-
-caseInsensitiveCompare:@"SEND"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"SEND"]
-                                NSString *address = nil;
-                                int port = 0;
@@ -1675 +1676 @@
-                                        [transfer release];
-                                }
-caseInsensitiveCompare:@"ACCEPT"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"ACCEPT"]
-                                BOOL passive = NO;
-                                int port = 0;
@@ -1709 +1710 @@
-                                        }
-                                }
-caseInsensitiveCompare:@"RESUME"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"RESUME"]
-                                BOOL passive = NO;
-                                int port = 0;
@@ -1743 +1744 @@
-                                        }
-                                }
+                        } else if( [subCommand isCaseInsensitiveEqualToString:@"CHAT"] ) {
+                                NSString *address = nil;
+                                int port = 0;
+
+                                [scanner scanUpToCharactersFromSet:whitespace intoString:&address];
+                                [scanner scanInt:&port];
+
+                                if( [address rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@".:"]].location == NSNotFound ) {
+                                        unsigned int ip4 = 0;
+                                        sscanf( [address UTF8String], "%u", &ip4 );
+                                        address = [NSString stringWithFormat:@"%lu.%lu.%lu.%lu", (ip4 & 0xff000000) >> 24, (ip4 & 0x00ff0000) >> 16, (ip4 & 0x0000ff00) >> 8, (ip4 & 0x000000ff)];
+                                }
+
+                                NSHost *host = [NSHost hostWithAddress:address];
+
+                                if( [fileName isCaseInsensitiveEqualToString:@"CHAT"] || [fileName isCaseInsensitiveEqualToString:@"C H A T"] ) {
+                                        MVDirectChatConnection *directChatConnection = [(MVDirectChatConnection *)[MVDirectChatConnection allocWithZone:nil] initWithUser:sender];
+                                        [directChatConnection _setPassive:NO];
+                                        [directChatConnection _setHost:host];
+                                        [directChatConnection _setPort:port];
+
+                                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVDirectChatConnectionOfferNotification object:directChatConnection userInfo:[NSDictionary dictionaryWithObjectsAndKeys:sender, @"user", nil]];
+
+                                        [directChatConnection release];
+                                }
-                        }
-
-                        [msg release];
-caseInsensitiveCompare:@"CLIENTINFO"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"CLIENTINFO"]
-                        // make this extnesible later with a plugin registration method
-                        [sender sendSubcodeReply:command withArguments:@"VERSION TIME PING DCC CLIENTINFO"];
-                }
-        } else {
-caseInsensitiveCompare:@"DCC"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"DCC"]
-                        NSString *msg = [self _newStringWithBytes:[arguments bytes] length:[arguments length]];
-                        NSString *subCommand = nil;
@@ -1760 +1786 @@
-                        [scanner scanUpToCharactersFromSet:whitespace intoString:&subCommand];
-
-caseInsensitiveCompare:@"REJECT"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"REJECT"]
-                                [scanner scanUpToCharactersFromSet:whitespace intoString:&subCommand];
-
-caseInsensitiveCompare:@"SEND"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"SEND"]
-                                        NSString *fileName = nil;
-                                        BOOL portKnown = NO;
@@ -1796 +1822 @@
-                                                                continue;
-
-caseInsensitiveCompare:fileName] == NSOrderedSame
+isCaseInsensitiveEqualToString:fileName]
-                                                        if( ! fileMatches && ! portKnown && ! passive )
-                                                                continue;
@@ -2188 +2214 @@
-                        if( [_lastSentIsonNicknames containsObject:nickLower] ) {
-                                MVChatUser *user = [self chatUserWithUniqueIdentifier:nick];
-caseInsensitiveCompare:nick] == NSOrderedSame
+isCaseInsensitiveEqualToString:nick]
-                                        [user _setNickname:nick]; // nick differed only in case, change to the proper case
-                                if( [[user dateUpdated] timeIntervalSinceNow] < -JVWatchedUserWHOISDelay || ! [user dateUpdated] )
@@ -2217 +2243 @@
-
-                        MVChatUser *user = [self chatUserWithUniqueIdentifier:nick];
-caseInsensitiveCompare:nick] == NSOrderedSame
+isCaseInsensitiveEqualToString:nick]
-                                [user _setNickname:nick]; // nick differed only in case, change to the proper case
-                        [self _markUserAsOnline:user];
@@ -2450 +2476 @@
-                NSString *nick = [parameters objectAtIndex:1];
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:nick];
-caseInsensitiveCompare:nick] == NSOrderedSame
+isCaseInsensitiveEqualToString:nick]
-                        [user _setNickname:nick]; // nick differed only in case, change to the proper case
-                [user _setUsername:[parameters objectAtIndex:2]];
@@ -2552 +2578 @@
-        if( [parameters count] == 3 ) {
-                NSString *comment = [self _stringFromPossibleData:[parameters objectAtIndex:2]];
-rangeOfString:@"identified" options:NSCaseInsensitiveSearch].location != NSNotFound
+hasCaseInsensitiveSubstring:@"identified"]
-                        MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-                        [user _setIdentified:YES];
@@ -2594 +2620 @@
-        if( [parameters count] >= 2 ) {
-                NSString *command = [parameters objectAtIndex:1];
-caseInsensitiveCompare:@"NickServ"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"NickServ"]
-                        // the NickServ command isn't supported, this is an older server
-                        // lets send a private message to NickServ to identify

trunk/Chat Core/MVIRCChatUser.m

@@ -110 +110 @@
-        NSString *command = [[notification userInfo] objectForKey:@"command"];
-        NSData *arguments = [[notification userInfo] objectForKey:@"arguments"];
-caseInsensitiveCompare:@"PING"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"PING"]
-                NSTimeInterval diff = [[NSDate date] timeIntervalSinceDate:[self attributeForKey:@"MVChatUserPingSendDateAttribute"]];
-                [self setAttribute:[NSNumber numberWithDouble:diff] forKey:MVChatUserPingAttribute];
-                [self setAttribute:nil forKey:@"MVChatUserPingSendDateAttribute"];
-caseInsensitiveCompare:@"VERSION"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"VERSION"]
-                NSString *info = [[NSString allocWithZone:nil] initWithData:arguments encoding:[[self connection] encoding]];
-                [self setAttribute:info forKey:MVChatUserClientInfoAttribute];
-                [info release];
-caseInsensitiveCompare:@"TIME"] == NSOrderedSame
+isCaseInsensitiveEqualToString:@"TIME"]
-                NSString *date = [[NSString allocWithZone:nil] initWithData:arguments encoding:[[self connection] encoding]];
-                NSCalendarDate *localThere = [NSCalendarDate dateWithNaturalLanguageString:date];

trunk/Chat Core/MVIRCFileTransfer.m

@@ -1 @@
-#import <arpa/inet.h>
-
-#import "MVIRCFileTransfer.h"
+
+#import "AsyncSocket.h"
+#import "InterThreadMessaging.h"
+#import "MVChatUser.h"
-#import "MVDirectClientConnection.h"
-#import "MVIRCChatConnection.h"
-#import "MVChatUser.h"
-#import "MVUtilities.h"
-#import "NSNotificationAdditions.h"
-#import "AsyncSocket.h"
-#import "InterThreadMessaging.h"
-#import "Transmission.h"
-
+#import <arpa/inet.h>
+
-#define DCCPacketSize 4096
-
-static NSString *dccFriendlyAddress( NSString *address ) {
-        NSURL *url = [NSURL URLWithString:@"http://colloquy.info/ip.php"];
-        NSURLRequest *request = [NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:3.];
-        NSData *result = [NSURLConnection sendSynchronousRequest:request returningResponse:NULL error:NULL];
-        if( [result length] >= 6 && [result length] <= 40 ) // should be a valid IPv4 or IPv6 address
-                address = [[[NSString allocWithZone:nil] initWithData:result encoding:NSASCIIStringEncoding] autorelease];
-
-        if( [address rangeOfString:@"."].location != NSNotFound )
-                return [NSString stringWithFormat:@"%lu", ntohl( inet_addr( [address UTF8String] ) )];
-        return address;
-}
-
-#pragma mark -
-
-@implementation MVIRCUploadFileTransfer
@@ -121 +108 @@
-
-- (void) directClientConnection:(MVDirectClientConnection *) connection acceptingConnectionsToHost:(NSString *) host port:(unsigned short) port {
-dcc
+MVDCC
-        [self _setPort:port];
-
@@ -336 +323 @@
-
-- (void) directClientConnection:(MVDirectClientConnection *) connection acceptingConnectionsToHost:(NSString *) host port:(unsigned short) port {
-dcc
+MVDCC
-        [self _setPort:port];
-

trunk/Controllers/JVChatController.h

@@ -4 +4 @@
-@class MVChatRoom;
-@class MVChatUser;
+@class MVDirectChatConnection;
-@class JVChatWindowController;
-@class JVChatRoomPanel;
@@ -38 +39 @@
-- (JVDirectChatPanel *) chatViewControllerForUser:(MVChatUser *) user ifExists:(BOOL) exists;
-- (JVDirectChatPanel *) chatViewControllerForUser:(MVChatUser *) user ifExists:(BOOL) exists userInitiated:(BOOL) requested;
+- (JVDirectChatPanel *) chatViewControllerForDirectChatConnection:(MVDirectChatConnection *) connection ifExists:(BOOL) exists;
+- (JVDirectChatPanel *) chatViewControllerForDirectChatConnection:(MVDirectChatConnection *) connection ifExists:(BOOL) exists userInitiated:(BOOL) initiated;
-- (JVChatTranscriptPanel *) chatViewControllerForTranscript:(NSString *) filename;
-- (JVChatConsolePanel *) chatConsoleForConnection:(MVChatConnection *) connection ifExists:(BOOL) exists;

trunk/Controllers/JVChatController.m

@@ -90 +90 @@
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _joinedRoom: ) name:MVChatRoomJoinedNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _invitedToRoom: ) name:MVChatRoomInvitedNotification object:nil];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _invitedToDirectChat: ) name:MVDirectChatConnectionOfferNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotBeep: ) name:MVChatConnectionGotBeepNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotPrivateMessage: ) name:MVChatConnectionGotPrivateMessageNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotRoomMessage: ) name:MVChatRoomGotMessageNotification object:nil];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _gotDirectChatMessage: ) name:MVDirectChatConnectionGotMessageNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _errorOccurred: ) name:MVChatConnectionErrorNotification object:nil];
-
@@ -325 +327 @@
-}
-
+- (JVDirectChatPanel *) chatViewControllerForDirectChatConnection:(MVDirectChatConnection *) connection ifExists:(BOOL) exists {
+        return [self chatViewControllerForDirectChatConnection:connection ifExists:exists userInitiated:YES];
+}
+
+- (JVDirectChatPanel *) chatViewControllerForDirectChatConnection:(MVDirectChatConnection *) connection ifExists:(BOOL) exists userInitiated:(BOOL) initiated {
+        NSParameterAssert( connection != nil );
+
+        NSEnumerator *enumerator = [_chatControllers objectEnumerator];
+        id ret = nil;
+
+        while( ( ret = [enumerator nextObject] ) )
+                if( [ret isMemberOfClass:[JVDirectChatPanel class]] && [[ret target] isEqual:connection] )
+                        break;
+
+        if( ! ret && ! exists ) {
+                if( ( ret = [[[JVDirectChatPanel alloc] initWithTarget:connection] autorelease] ) ) {
+                        [_chatControllers addObject:ret];
+                        [self addViewControllerToPreferedWindowController:ret userInitiated:initiated];
+                }
+        }
+
+        return ret;
+}
+
-- (JVChatTranscriptPanel *) chatViewControllerForTranscript:(NSString *) filename {
-        id ret = nil;
@@ -486 +512 @@
-        NSString *message = [NSString stringWithFormat:NSLocalizedString( @"You were invited to join %@ by %@. Would you like to accept this invitation and join this room?", "you were invited to join a chat room status message" ), room, [user nickname]];
-
-        if( NSRunInformationalAlertPanel( title, message, NSLocalizedString( @"Join", "join button" ), NSLocalizedString( @"Decline", "decline button" ), nil ) == NSOKButton )
-                [connection joinChatRoomNamed:room];
-
-        NSMutableDictionary *context = [NSMutableDictionary dictionary];
-        [context setObject:NSLocalizedString( @"Invited to Chat", "bubble title invited to room" ) forKey:@"title"];
-        [context setObject:[NSString stringWithFormat:NSLocalizedString( @"You were invited to %@ by %@.", "bubble message invited to room" ), room, [user nickname]] forKey:@"description"];
-        [[JVNotificationController defaultController] performNotification:@"JVChatRoomInvite" withContextInfo:context];
+
+        if( NSRunInformationalAlertPanel( title, message, NSLocalizedString( @"Join", "join button" ), NSLocalizedString( @"Decline", "decline button" ), nil ) == NSOKButton )
+                [connection joinChatRoomNamed:room];
+}
+
+- (void) _invitedToDirectChat:(NSNotification *) notification {
+        MVChatUser *user = [[notification userInfo] objectForKey:@"user"];
+        MVDirectChatConnection *connection = [notification object];
+
+        if( ! [[MVConnectionsController defaultController] managesConnection:[user connection]] ) return;
+
+        NSString *title = NSLocalizedString( @"Direct Chat Invite", "invited to direct chat title" );
+        NSString *message = [NSString stringWithFormat:NSLocalizedString( @"You were invited to participate in a chat with %@. Would you like to accept this invitation?", "you were invited to a direct chat status message" ), [user nickname]];
+
+        NSMutableDictionary *context = [NSMutableDictionary dictionary];
+        [context setObject:NSLocalizedString( @"Invited to Direct Chat", "bubble title invited to direct chat" ) forKey:@"title"];
+        [context setObject:[NSString stringWithFormat:NSLocalizedString( @"You were invited to participate in a chat with %@.", "bubble message invited to participate in a direct chat" ), [user nickname]] forKey:@"description"];
+        [[JVNotificationController defaultController] performNotification:@"JVDirectChatInvite" withContextInfo:context];
+
+        if( NSRunInformationalAlertPanel( title, message, NSLocalizedString( @"Accept", "accept button" ), NSLocalizedString( @"Decline", "decline button" ), nil ) == NSOKButton ) {
+                [self chatViewControllerForDirectChatConnection:connection ifExists:NO userInitiated:NO];
+                [connection initiate];
+        }
-}
-
@@ -507 +553 @@
-        [context setObject:NSStringFromSelector( @selector( activate: ) ) forKey:@"action"];
-        [[JVNotificationController defaultController] performNotification:@"JVChatBeeped" withContextInfo:context];
+}
+
+- (void) _gotDirectChatMessage:(NSNotification *) notification {
+        MVDirectChatConnection *connection = [notification object];
+        NSData *message = [[notification userInfo] objectForKey:@"message"];
+        MVChatUser *user = [connection user];
+
+        if( ! [[MVConnectionsController defaultController] managesConnection:[user connection]] ) return;
+
+        if( ( [self shouldIgnoreUser:user withMessage:nil inView:nil] == JVNotIgnored ) ) {
+                JVDirectChatPanel *controller = [self chatViewControllerForDirectChatConnection:connection ifExists:NO userInitiated:NO];
+                [controller addMessageToDisplay:message fromUser:user asAction:[[[notification userInfo] objectForKey:@"action"] boolValue] withIdentifier:[[notification userInfo] objectForKey:@"identifier"] andType:JVChatMessageNormalType];
+        }
+}
+
+- (void) _gotRoomMessage:(NSNotification *) notification {
+        // we do this here to make sure we catch early messages right when we join (this includes dircproxy's dump)
+        MVChatRoom *room = [notification object];
+        JVChatRoomPanel *controller = [self chatViewControllerForRoom:room ifExists:NO];
+        [controller handleRoomMessageNotification:notification];
-}
-
@@ -570 +636 @@
-}
-
-- (void) _gotRoomMessage:(NSNotification *) notification {
-        // we do this here to make sure we catch early messages right when we join (this includes dircproxy's dump)
-        MVChatRoom *room = [notification object];
-        JVChatRoomPanel *controller = [self chatViewControllerForRoom:room ifExists:NO];
-        [controller handleRoomMessageNotification:notification];
-}
-
-- (void) _errorOccurred:(NSNotification *) notification {
-        NSError *error = [[notification userInfo] objectForKey:@"error"];

trunk/Panels/JVChatRoomMember.m

@@ -73 +73 @@
-- (NSComparisonResult) compareUsingStatus:(JVChatRoomMember *) member {
-        NSComparisonResult retVal = NSOrderedSame;
-
-
-
-
+
+
+
-
-        if( myStatus > yourStatus ) {

trunk/Panels/JVDirectChatPanel.m

@@ -157 +157 @@
-                _target = [target retain];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                if( ! [fileManager fileExistsAtPath:logs] ) [fileManager createDirectoryAtPath:logs attributes:nil];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+