Merge pull request Codeux-Software#413 from foldericon/smarter_nick_c…

…ompletion_squashed

Smarter nick completion squashed

Classes/Library/TLONickCompletionStatus.m

@@ -335,7 +335,7 @@ - (void)completeNick:(BOOL)forward
 	NSString *lowerCombinedCut = combinedCut.lowercaseString;
 
 	NSMutableArray *upperChoices = [NSMutableArray array];
-	NSMutableArray *lowerChoices;
+	NSMutableArray *lowerChoices = [NSMutableArray array];
 
 	if (commandMode) {
 		for (NSString *command in [TPCPreferences publicIRCCommandList]) {
@@ -372,11 +372,23 @@ - (void)completeNick:(BOOL)forward
 		[upperChoices safeAddObject:client.isupport.networkNameActual];
 	}
 
-	lowerChoices = [upperChoices mutableCopy];
 
-	/* Quick method for replacing the value of each array
-	 object based on a provided selector. */
-	[lowerChoices performSelectorOnObjectValueAndReplace:@selector(lowercaseString)];
+  /* Quick method for replacing the value of each array
+   object based on a provided selector. */
+
+    NSArray *tempChoices = [upperChoices copy];
+    NSCharacterSet *nonAlpha = [NSCharacterSet characterSetWithCharactersInString:@"^[]-_`{}\\"];
+    [upperChoices removeAllObjects];
+    for (NSString *s in tempChoices) {
+        [upperChoices safeAddObject:s];
+        [lowerChoices safeAddObject:[s lowercaseString]];
+        NSString *stripped = [s stringByTrimmingCharactersInSet:nonAlpha];
+        if (stripped != s) {
+            [upperChoices safeAddObject:s];
+            [lowerChoices safeAddObject:[stripped lowercaseString]];
+        }
+    }
+
 
 	/* We will now get a list of matches to our backward cut. */
 	NSMutableArray *currentUpperChoices = [NSMutableArray array];