Changeset 3300

Timestamp:

06/13/06 02:21:08 (2 years ago)

Author:

rinoa

Message:

Adds the away message to the whois dialog. Fixes #307

Files:

• trunk/Chat Core/MVIRCChatConnection.m (modified) (2 diffs)
• trunk/Inspectors/JVChatMemberInspector.m (modified) (2 diffs)

trunk/Chat Core/MVIRCChatConnection.m

@@ -2044 +2044 @@
-        if( [parameters count] == 3 ) {
-                MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-
-send
+! 
+us
-                        [user _setAwayStatusMessage:[parameters objectAtIndex:2]];
-                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatUserAwayStatusMessageChangedNotification object:user userInfo:nil];
@@ -2233 +2233 @@
-                [user _setRealName:[self _stringFromPossibleData:[parameters objectAtIndex:5]]];
-                [user _setDateDisconnected:nil];
+                [user _setAwayStatusMessage:nil]; // set this to nil, we will get it if we get a 301
-
-                [self _sendPossibleOnlineNotificationForUser:user];

trunk/Inspectors/JVChatMemberInspector.m

@@ -89 +89 @@
-#pragma mark -
-
+- (NSMutableAttributedString *) _convertRawMessage:(NSData *) message withBaseFont:(NSFont *) baseFont {
+        if( ! message || ! [message length] ) return nil;
+        if( ! baseFont ) baseFont = [NSFont labelFontOfSize:11.];
+
+        NSMutableDictionary *options = [NSMutableDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:[[_member connection] encoding]], @"StringEncoding", [NSNumber numberWithBool:[[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatStripMessageColors"]], @"IgnoreFontColors", [NSNumber numberWithBool:[[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatStripMessageFormatting"]], @"IgnoreFontTraits", baseFont, @"BaseFont", nil];
+        NSMutableAttributedString *messageString = [NSMutableAttributedString attributedStringWithChatFormat:message options:options];
+
+        if( ! messageString ) {
+                [options setObject:[NSNumber numberWithUnsignedInt:NSISOLatin1StringEncoding] forKey:@"StringEncoding"];
+                messageString = [NSMutableAttributedString attributedStringWithChatFormat:message options:options];
+        }
+
+        return messageString;
+}
+
-- (void) gotAddress:(NSString *) ip {
-        [address setObjectValue:( ip ? ip : NSLocalizedString( @"n/a", "not applicable or not available" ) )];
@@ -111 +126 @@
-                [class setObjectValue:NSLocalizedString( @"Normal user", "normal user class" )];
-        }
+        
+        NSData *awayData = [[_member user] awayStatusMessage];
+        NSAttributedString *awayString = [self _convertRawMessage:awayData withBaseFont:nil];
+        if( ! awayString || ! [awayString length] ) [away setObjectValue:NSLocalizedString( @"n/a", "not applicable or not available" )];
+        else [away setObjectValue:awayString];
-
-        [username setObjectValue:[[_member user] username]];