Changeset 3275

Show
Ignore:
Timestamp:
06/08/06 00:27:44 (2 years ago)
Author:
timothy
Message:

Some ignore fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Models/KAIgnoreRule.m

    r3072 r3275  
    7070 
    7171- (JVIgnoreMatchResult) matchUser:(MVChatUser *) user message:(NSString *) message inView:(id <JVChatViewController>) view { 
    72         if( ! [_rooms count] || ( [view isKindOfClass:[JVDirectChatPanel class]] && [_rooms containsObject:[(JVDirectChatPanel *)view target]] ) ) { 
     72        if( ! [_rooms count] || ! view || ( [view isKindOfClass:[JVDirectChatPanel class]] && [_rooms containsObject:[[(JVDirectChatPanel *)view target] displayName]] ) ) { 
    7373                BOOL userFound = NO; 
    7474                BOOL messageFound = NO; 
    …… 
    7979                else if( [_ignoredUser length] ) userFound = [_ignoredUser isEqualToString:[user nickname]]; 
    8080 
    81                 if( _messageRegex && [_messageRegex findInString:message] ) messageFound = YES; 
    82                 else if( [_ignoredMessage length] ) messageFound = ( [message rangeOfString:_ignoredMessage options:NSCaseInsensitiveSearch].location != NSNotFound ); 
     81                if( _messageRegex && message && [_messageRegex findInString:message] ) messageFound = YES; 
     82                else if( [_ignoredMessage length] && message ) messageFound = ( [message rangeOfString:_ignoredMessage options:NSCaseInsensitiveSearch].location != NSNotFound ); 
    8383 
    8484                if( userRequired ) {