Mask +k keys in channel and show the k mode in title bar.

bakerma07 · Jul 24, 2012 · a0b0049 · a0b0049
1 parent e1e001c
commit a0b0049
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Classes/Controllers/TXMasterController.m b/Classes/Controllers/TXMasterController.m
@@ -1224,6 +1224,7 @@ - (void)_moveInputHistory:(BOOL)up checkScroller:(BOOL)scroll event:(NSEvent *)e
 
 	if (s) {
         [self.text setAttributedStringValue:s];
+
 		[self.world focusInputText];
 
         if ([self.text respondsToSelector:@selector(resetTextFieldCellSize:)]) {

diff --git a/Classes/IRC/IRCChannelMode.m b/Classes/IRC/IRCChannelMode.m
@@ -157,13 +157,13 @@ - (NSString *)format:(BOOL)maskK
 	[str appendString:@"+"];
 
 	for (IRCModeInfo *h in self.allModes) {
-		if (maskK == YES) {
-			if (h.mode == 'k') continue;
-		}
-
 		if (h.plus) {
-			if (h.param) {
-				[trail appendFormat:@" %@", h.param];
+			if (h.param && maskK == NO) {
+				if (h.mode == 'k') {
+					[trail appendFormat:@" ******"];
+				} else {
+					[trail appendFormat:@" %@", h.param];
+				}
 			}
 
 			[str appendFormat:@"%c", h.mode];

diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
@@ -4391,7 +4391,7 @@ - (void)receiveMode:(IRCMessage *)m
 				[self send:IRCPrivateCommandIndex("who"), c.name, nil, nil];
 			}
 
-			[self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCModeSet", nick, modeStr) receivedAt:m.receivedAt];
+			[self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCModeSet", nick, [c.mode string]) receivedAt:m.receivedAt];
 		}
 	} else {
 		[self printBoth:nil type:TVCLogLineModeType text:TXTFLS(@"IRCModeSet", nick, modeStr) receivedAt:m.receivedAt];
@@ -4886,7 +4886,7 @@ - (void)receiveNumericReply:(IRCMessage *)m
 					c.isModeInit = YES;
 				}
 
-				[self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCChannelHasModes", modeStr) receivedAt:m.receivedAt];
+				[self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCChannelHasModes", [c.mode string]) receivedAt:m.receivedAt];
 			}
 
 			break;

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>11992</string>
+	<string>11997</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-248-gb370ab1-debug,llvm4.0</string>
+	<string>2.1.1-249-ge1e001c-appstore,llvm4.0</string>
 </dict>
 </plist>