Changeset 3589

Timestamp:

02/25/07 18:04:50 (2 years ago)

Author:

timothy

Message:

Adds transient attributes for JVChatMessages, good for plugins to store objects in while handeling a message. Patch by hennk. #1015

Files:

• trunk/Additions/NSImageAdditions.m (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.h (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVChatUser.h (modified) (1 diff)
• trunk/Chat Core/MVChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVDirectChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVDirectChatConnection.m (modified) (2 diffs)
• trunk/Chat Core/MVICBChatRoom.h (modified) (1 diff)
• trunk/Chat Core/MVICBChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVICBChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (6 diffs)
• trunk/Chat Core/MVIRCChatRoom.m (modified) (1 diff)
• trunk/Chat Core/MVIRCChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVSILCChatRoom.m (modified) (2 diffs)
• trunk/Chat Core/MVSILCChatUser.m (modified) (2 diffs)
• trunk/Controllers/JVChatController.m (modified) (2 diffs)
• trunk/Models/JVChatMessage.h (modified) (3 diffs)
• trunk/Models/JVChatMessage.m (modified) (4 diffs)
• trunk/Panels/JVChatRoomPanel.m (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.h (modified) (1 diff)
• trunk/Panels/JVDirectChatPanel.m (modified) (5 diffs)

trunk/Additions/NSImageAdditions.m

@@ -86 +86 @@
-                        imageRep = object;
-
- 
+
-                imageRep = [NSBitmapImageRep imageRepWithData:[self TIFFRepresentation]];
-                if( imageRep ) [self addRepresentation:imageRep];

trunk/Chat Core/MVChatConnection.h

@@ -407 +407 @@
-
-@interface NSObject (MVChatPluginConnectionSupport)
-isNotice:(BOOL) notice
-
+attributes:(NSMutableDictionary *)msgAttributes
+ attributes:(NSDictionary *)msgAttributes
-
-- (BOOL) processSubcodeRequest:(NSString *) command withArguments:(NSData *) arguments fromUser:(MVChatUser *) user;

trunk/Chat Core/MVChatRoom.h

@@ -147 +147 @@
-- (void) sendMessage:(NSAttributedString *) message asAction:(BOOL) action;
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action;
+- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes;
-
-- (void) sendSubcodeRequest:(NSString *) command withArguments:(id) arguments;

trunk/Chat Core/MVChatRoom.m

@@ -229 +229 @@
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
-
+
+
+
+
+
-        [self doesNotRecognizeSelector:_cmd];
-}

trunk/Chat Core/MVChatUser.h

@@ -181 +181 @@
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action;
+- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes;
-- (MVUploadFileTransfer *) sendFile:(NSString *) path passively:(BOOL) passive;
-

trunk/Chat Core/MVChatUser.m

@@ -422 +422 @@
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
-
+
+
+
+
+
-        [self doesNotRecognizeSelector:_cmd];
-}

trunk/Chat Core/MVDirectChatConnection.h

@@ -58 +58 @@
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action;
+- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *)attributes;
-@end

trunk/Chat Core/MVDirectChatConnection.m

@@ -160 +160 @@
-
-- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding asAction:(BOOL) action {
+        [self sendMessage:message withEncoding:encoding withAttributes:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:action] forKey:@"action"]];
+}
+
+- (void) sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *)attributes {
-        NSParameterAssert( message != nil );
-
@@ -183 +187 @@
-        NSData *msg = [message chatFormatWithOptions:options];
-
-action
+[[attributes objectForKey:@"action"] boolValue]
-                NSMutableData *newMsg = [[NSMutableData allocWithZone:nil] initWithCapacity:[msg length] + 11];
-                [newMsg appendBytes:"\001ACTION " length:8];

trunk/Chat Core/MVICBChatRoom.h

@@ -46 +46 @@
-- (void) setTopic:(NSAttributedString *) newTopic;
-- (void) sendMessage:(NSAttributedString *) message
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-@end

trunk/Chat Core/MVICBChatRoom.m

@@ -61 +61 @@
-
-- (void) sendMessage:(NSAttributedString *) message
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        if( [_memberUsers count] > 1 )
-                [(MVICBChatConnection *)_connection ctsOpenPacket:[message string]];

trunk/Chat Core/MVICBChatUser.m

@@ -70 +70 @@
-- (void) sendMessage:(NSAttributedString *) message
-         withEncoding:(NSStringEncoding) encoding
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        [(MVICBChatConnection *)_connection ctsCommandPersonal:_nickname withMessage:[message string]];
-}

trunk/Chat Core/MVIRCChatConnection.h

@@ -46 +46 @@
-        
-+ (NSData *) _flattenedIRCDataForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format;
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-
-- (void) _processErrorCode:(int) errorCode withContext:(char *) context;

trunk/Chat Core/MVIRCChatConnection.m

@@ -931 +931 @@
-}
-
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        NSParameterAssert( [target isKindOfClass:[MVChatUser class]] || [target isKindOfClass:[MVChatRoom class]] );
-
-        NSMutableData *msg = [[[self class] _flattenedIRCDataForMessage:message withEncoding:msgEncoding andChatFormat:[self outgoingChatFormat]] mutableCopyWithZone:nil];
-
-
+@encode( NSDictionary * ), 
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-
+attributes:
-        [invocation setArgument:&msg atIndex:2];
-        [invocation setArgument:&target atIndex:3];
+        [invocation setArgument:&attributes atIndex:4];
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
@@ -950 +951 @@
-        NSString *targetName = [target isKindOfClass:[MVChatRoom class]] ? [target name] : [target nickname];
-
-action
+[[attributes objectForKey:@"action"] boolValue]
-                NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"PRIVMSG %@ :\001ACTION ", targetName];
-                [self sendRawMessageWithComponents:prefix, msg, @"\001", nil];
@@ -1463 +1464 @@
-        MVChatUser *sender = [privmsgInfo objectForKey:@"user"];
-        NSMutableData *message = [privmsgInfo objectForKey:@"message"];
-
-
-
+
+
+
+
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-isNotice
+attributes
-        [invocation setArgument:&message atIndex:2];
-        [invocation setArgument:&sender atIndex:3];
-        [invocation setArgument:&room atIndex:4];
-isNotice
+msgAttributes
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
@@ -1477 +1479 @@
-
-        if( room ) {
-privmsgInfo
+msgAttributes
-        } else {
-privmsgInfo
+msgAttributes
-        }
-}
@@ -1531 +1533 @@
-        MVChatUser *sender = [noticeInfo objectForKey:@"user"];
-        NSMutableData *message = [noticeInfo objectForKey:@"message"];
-
-
-
+
+
+
+
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-isNotice
+attributes
-        [invocation setArgument:&message atIndex:2];
-        [invocation setArgument:&sender atIndex:3];
-        [invocation setArgument:&room atIndex:4];
-isNotice
+msgAttributes
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
@@ -1545 +1548 @@
-
-        if( room ) {
-noticeInfo
+msgAttributes
-        } else {
-noticeInfo
+msgAttributes
-
-                if( [[sender nickname] isEqualToString:@"NickServ"] ) {

trunk/Chat Core/MVIRCChatRoom.m

@@ -54 +54 @@
-#pragma mark -
-
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        NSParameterAssert( message != nil );
-asAction:action
+withAttributes:attributes
-}
-

trunk/Chat Core/MVIRCChatUser.m

@@ -42 +42 @@
-#pragma mark -
-
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        NSParameterAssert( message != nil );
-asAction:action
+withAttributes:attributes
-}
-

trunk/Chat Core/MVSILCChatRoom.m

@@ -66 +66 @@
-#pragma mark -
-
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        NSParameterAssert( message != nil );
-
@@ -72 +72 @@
-        SilcMessageFlags flags = SILC_MESSAGE_FLAG_UTF8;
-
-action
+[[attributes objectForKey:@"action"] boolValue]
-
-        SilcLock( [[self connection] _silcClient] );

trunk/Chat Core/MVSILCChatUser.m

@@ -105 +105 @@
-#pragma mark -
-
-asAction:(BOOL) action
+withAttributes:(NSDictionary *) attributes
-        NSParameterAssert( message != nil );
-
@@ -111 +111 @@
-        SilcMessageFlags flags = SILC_MESSAGE_FLAG_UTF8;
-
-action
+[[attributes objectForKey:@"action"] boolValue]
-
-        // unpack the identifier here for now

trunk/Controllers/JVChatController.m

@@ -564 +564 @@
-        if( ( [self shouldIgnoreUser:user withMessage:nil inView:nil] == JVNotIgnored ) ) {
-                JVDirectChatPanel *controller = [self chatViewControllerForDirectChatConnection:connection ifExists:NO userInitiated:NO];
-asAction:[[[notification userInfo] objectForKey:@"action"] boolValue
+withAttributes:[notification userInfo
-        }
-}
@@ -632 +632 @@
-                JVDirectChatPanel *controller = [self chatViewControllerForUser:user ifExists:NO userInitiated:NO];
-                JVChatMessageType type = ( [[[notification userInfo] objectForKey:@"notice"] boolValue] ? JVChatMessageNoticeType : JVChatMessageNormalType );
-asAction:[[[notification userInfo] objectForKey:@"action"] boolValue
+withAttributes:[notification userInfo
-        }
-}

trunk/Models/JVChatMessage.h

@@ -34 +34 @@
-        BOOL _bodyLoaded;
-        BOOL _senderLoaded;
+        NSMutableDictionary *_attributes;
-}
-- (/* xmlNode */ void *) node;
@@ -64 +65 @@
-- (NSScriptObjectSpecifier *) objectSpecifier;
-- (void) setObjectSpecifier:(NSScriptObjectSpecifier *) objectSpecifier;
+
+- (NSDictionary *) attributes;
+- (id) attributeForKey:(id) key;
-@end
-
@@ -89 +93 @@
-- (void) setSource:(NSURL *) source;
-- (void) setMessageIdentifier:(NSString *) identifier;
+
+- (NSMutableDictionary *) attributes;
+- (void) setAttributes:(NSDictionary *) attributes;
+- (void) setAttribute:(id) object forKey:(id) key;
-@end

trunk/Models/JVChatMessage.m

@@ -97 +97 @@
-                ret -> _ignoreStatus = [self ignoreStatus];
-                ret -> _type = [self type];
+                ret -> _attributes = [[self attributes] copyWithZone:zone];
-        }
-
@@ -108 +109 @@
-        [_source release];
-        [_objectSpecifier release];
+        [_attributes release];
-
-        [_senderIdentifier release];
@@ -329 +331 @@
-#pragma mark -
-
+- (NSDictionary *) attributes {
+        // Add important attributes which are set via normal setters, and therefore don't exist normally in the attributes-dict.
+        if( ! _attributes )
+                _attributes = [[NSMutableDictionary alloc] init];
+        [_attributes setObject:[NSNumber numberWithBool:_action] forKey:@"action"];
+
+        return _attributes;
+}
+
+- (id) attributeForKey:(id) key {
+        return [_attributes objectForKey:key];
+}
+
+#pragma mark -
+
-- (NSString *) description {
-        return [self bodyAsPlainText];
@@ -557 +574 @@
-}
-
+- (NSMutableDictionary *) attributes {
+        // This depends on the implementation of JVChatMessage using an NSMutableDictionary for its attributes, and actually returning a mutable version of it.
+        return (NSMutableDictionary *)[super attributes];
+}
+
+- (void) setAttributes:(NSDictionary *) attributes {
+        [self _setNode:NULL];
+        id old = _attributes;
+        _attributes = [attributes mutableCopyWithZone:[self zone]];
+        [old release];
+}
+
+- (void) setAttribute:(id) object forKey:(id) key {
+        if( ! _attributes )
+                _attributes = [[NSMutableDictionary alloc] init];
+        [_attributes setObject:object forKey:key];
+}
+
-#pragma mark -
-

trunk/Panels/JVChatRoomPanel.m

@@ -319 +319 @@
-- (void) handleRoomMessageNotification:(NSNotification *) notification {
-        JVChatMessageType type = ( [[[notification userInfo] objectForKey:@"notice"] boolValue] ? JVChatMessageNoticeType : JVChatMessageNormalType );
-asAction:[[[notification userInfo] objectForKey:@"action"] boolValue
+withAttributes:[notification userInfo
-}
-

trunk/Panels/JVDirectChatPanel.h

@@ -59 +59 @@
-- (void) addEventMessageToDisplay:(NSString *) message withName:(NSString *) name andAttributes:(NSDictionary *) attributes;
-- (void) addMessageToDisplay:(NSData *) message fromUser:(MVChatUser *) user asAction:(BOOL) action withIdentifier:(NSString *) identifier andType:(JVChatMessageType) type;
+- (void) addMessageToDisplay:(NSData *) message fromUser:(MVChatUser *) user withAttributes:(NSDictionary *) msgAttributes withIdentifier:(NSString *) identifier andType:(JVChatMessageType) type;
-- (void) processIncomingMessage:(JVMutableChatMessage *) message;
-- (void) echoSentMessageToDisplay:(JVMutableChatMessage *) message;

trunk/Panels/JVDirectChatPanel.m

@@ -741 +741 @@
-}
-
-
+
+
+
+
+
+
-        if( ! _nibLoaded ) [self view];
-
@@ -770 +775 @@
-        JVMutableChatMessage *cmessage = [[JVMutableChatMessage alloc] initWithText:messageString sender:user];
-        [cmessage setMessageIdentifier:identifier];
-
+
+
-        [cmessage setType:type];
-
@@ -948 +954 @@
-        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:[self encoding]], @"StringEncoding", cformat, @"FormatType", nil];
-        NSData *msgData = [[message body] chatFormatWithOptions:options]; // we could save this back to the message object before sending
-asAction:[message isAction
+withAttributes:[message attributes
-}
-
@@ -1089 +1095 @@
-
-        if( [[message body] length] )
-asAction:[message isAction
+withAttributes:[message attributes
-}
-
@@ -1149 +1155 @@
-        } else if( ( [event modifierFlags] & NSAlternateKeyMask ) != 0 ) {
-                ret = NO;
- 
+
-                [self send:[NSNumber numberWithBool:YES]];
-                ret = YES;