Changeset 3550

Timestamp:

01/14/07 12:17:48 (2 years ago)

Author:

timothy

Message:

Cleans up some code and fixes an exception, -[NSConcreteMutableData doubleValue]: selector not recognized. #958 Also makes sure we set and remove the away status of the local user when we get a 305 or 306, some bouncers send this on connect.

Files:

• trunk/Chat Core/MVIRCChatConnection.m (modified) (20 diffs)

trunk/Chat Core/MVIRCChatConnection.m

@@ -26 +26 @@
-#define JVWatchedUserWHOISDelay 300.
-#define JVWatchedUserISONDelay 60.
-
+
+
+
-#define JVMaximumMembersForWhoRequest 100
+#define JVFirstViableTimestamp 631138520
-#define JVFallbackEncoding NSISOLatin1StringEncoding
-
@@ -496 +499 @@
-- (void) setAwayStatusMessage:(NSAttributedString *) message {
-        if( [[message string] length] ) {
-                [[self localUser] _setStatus:MVChatUserAwayStatus];
-
-                MVSafeCopyAssign( &_awayMessage, message );
-
-                NSData *msg = [[self class] _flattenedIRCDataForMessage:message withEncoding:[self encoding] andChatFormat:[self outgoingChatFormat]];
-                [self sendRawMessageImmediatelyWithComponents:@"AWAY :", msg, nil];
+
+                [[self localUser] _setAwayStatusMessage:msg];
+                [[self localUser] _setStatus:MVChatUserAwayStatus];
-        } else {
-                MVSafeAssign( &_awayMessage, nil );
+
+                [self sendRawMessage:@"AWAY" immediately:YES];
+
+                [[self localUser] _setAwayStatusMessage:nil];
-                [[self localUser] _setStatus:MVChatUserAvailableStatus];
-                [self sendRawMessage:@"AWAY" immediately:YES];
-        }
-}
@@ -882 +889 @@
-        // for the command and its parameters.
-
-510 ) [data setLength:510
+JVMaximumCommandLength ) [data setLength:JVMaximumCommandLength
-        [data appendBytes:"\x0D\x0A" length:2];
-
@@ -1304 +1311 @@
-                        _watchCommandSupported = YES;
-
-510
+JVMaximumWatchCommandLength
-                        [request setString:@"WATCH "];
-
@@ -1314 +1321 @@
-                                        NSString *nick = [rule nickname];
-                                        if( nick && ! [rule nicknameIsRegularExpression] ) {
-510
+JVMaximumWatchCommandLength
-                                                        [self sendRawMessage:request];
-                                                        [request release];
-
-510
+JVMaximumWatchCommandLength
-                                                        [request setString:@"WATCH "];
-                                                }
@@ -1584 +1591 @@
-#elif __i386__
-                        NSString *processor = @"Intel";
+#elif __arm__
+                        NSString *processor = @"ARM";
-#else
-                        NSString *processor = @"Unknown Architecture";
@@ -2000 +2009 @@
-        if( [parameters count] == 2 && [sender isKindOfClass:[MVChatUser class]] ) {
-                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:0]];
-
+
+
+
-                [room _setTopicAuthor:sender];
-                [room _setTopicDate:[NSDate date]];
@@ -2018 +2029 @@
-        unsigned int i = 0, count = [parameters count];
-        while( i < count ) {
-parameters objectAtIndex:i++
+self _stringFromPossibleData:[parameters objectAtIndex:i++]
-                if( [param length] ) {
-                        char chr = [param characterAtIndex:0];
@@ -2150 +2161 @@
-                        [self _parseRoomModes:[parameters subarrayWithRange:NSMakeRange( 1, [parameters count] - 1)] forRoom:room fromSender:sender];
-                } else {
-
+ not handled yet
-                }
-        }
@@ -2293 +2304 @@
-        if( [parameters count] == 3 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-
+
+
+
+
+
-                        [user _setStatus:MVChatUserAwayStatus];
-
+
-                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatUserAwayStatusMessageChangedNotification object:user userInfo:nil];
-                }
@@ -2303 +2318 @@
-- (void) _handle305WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_UNAWAY
-        MVAssertCorrectThreadRequired( _connectionThread );
+
+        [[self localUser] _setAwayStatusMessage:nil];
+        [[self localUser] _setStatus:MVChatUserAvailableStatus];
+
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionSelfAwayStatusChangedNotification object:self userInfo:nil];
-}
@@ -2308 +2327 @@
-- (void) _handle306WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_NOWAWAY
-        MVAssertCorrectThreadRequired( _connectionThread );
+
+        [[self localUser] _setStatus:MVChatUserAwayStatus];
+
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionSelfAwayStatusChangedNotification object:self userInfo:nil];
-}
@@ -2419 +2441 @@
-
-        if( [parameters count] >= 2 ) {
-parameters objectAtIndex:1
+self _stringFromPossibleData:[parameters objectAtIndex:1]
-                if( room ) [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomMemberUsersSyncedNotification object:room];
-        }
@@ -2456 +2478 @@
-                        NSString *dateString = [self _stringFromPossibleData:[parameters objectAtIndex:4]];
-                        NSTimeInterval time = [dateString doubleValue];
-631138520 ) // this makes sure it is a viable date
+JVFirstViableTimestamp )
-                                [user setAttribute:[NSDate dateWithTimeIntervalSince1970:time] forKey:MVChatUserBanDateAttribute];
-                }
@@ -2471 +2493 @@
-
-        if( [parameters count] >= 2 ) {
-parameters objectAtIndex:1
+self _stringFromPossibleData:[parameters objectAtIndex:1]
-                [room _setBansSynced:YES];
-                if( room ) [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomBannedUsersSyncedNotification object:room];
@@ -2485 +2507 @@
-        if( [parameters count] == 3 ) {
-                MVChatRoom *room = [self joinedChatRoomWithName:[parameters objectAtIndex:1]];
-
+
+
+
-        }
-}
@@ -2496 +2520 @@
-                MVChatUser *author = [MVChatUser wildcardUserFromString:[parameters objectAtIndex:2]];
-                [room _setTopicAuthor:author];
-
-
+
+
+
+
+
+
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomTopicChangedNotification object:room userInfo:nil];
-        }
@@ -2529 +2557 @@
-        if( [parameters count] >= 3 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-parameters objectAtIndex:2
+self _stringFromPossibleData:[parameters objectAtIndex:2]
-        }
-}
@@ -2547 +2575 @@
-        if( [parameters count] >= 3 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-
+
+
-                [user _setDateConnected:nil];
-
@@ -2554 +2583 @@
-                        NSString *connectedTime = [self _stringFromPossibleData:[parameters objectAtIndex:3]];
-                        NSTimeInterval time = [connectedTime doubleValue];
-// prevent showing 34+ years connected time, this makes sure it is a viable date
-if( time > 631138520 ) 
+if( time > JVFirstViableTimestamp )
+       
-                }
-        }