Changeset 3287

Show
Ignore:
Timestamp:
06/10/06 22:43:33 (2 years ago)
Author:
timothy
Message:

The pre-filled hostmask in the custom ban sheet is now correct with nickname, username and address. Fixes #658.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Panels/JVChatRoomMember.m

    r3274 r3287  
    580580 
    581581- (IBAction) ban:(id) sender { 
    582         MVChatUser *user = [MVChatUser wildcardUserWithNicknameMask:nil andHostMask:[NSString stringWithFormat:@"*@%@", [self address]]]; 
     582        MVChatUser *user = [MVChatUser wildcardUserWithNicknameMask:nil andHostMask:[NSString stringWithFormat:@"*!*@%@", [self address]]]; 
    583583        [[[self room] target] addBanForUser:user]; 
    584584} 
    …… 
    624624        [firstTitle setStringValue:NSLocalizedString( @"With hostmask:", "ban hostmask label")]; 
    625625 
    626         if( [self address]) [firstField setStringValue:[NSString stringWithFormat:@"%@!%@", [self nickname], [self address]]]; 
     626        if( [self username] && [self address] ) 
     627                [firstField setStringValue:[NSString stringWithFormat:@"%@!%@@%@", [self nickname], [self username], [self address]]]; 
    627628        else [firstField setStringValue:@""]; 
    628629 
    …… 
    667668        [secondTitle setStringValue:NSLocalizedString( @"And reason:", "kick reason (secondary)" )]; 
    668669 
    669         if( [self address] ) [firstField setStringValue:[NSString stringWithFormat:@"%@!%@", [self nickname], [self address]]]; 
     670        if( [self username] && [self address] ) 
     671                [firstField setStringValue:[NSString stringWithFormat:@"%@!%@@%@", [self nickname], [self username], [self address]]]; 
    670672        else [firstField setStringValue:@""]; 
    671673        [secondField setStringValue:@""];