Bug fixes (URL parsing): Various bug fixes

slubman · Mar 2, 2009 · 6299945 · 6299945
1 parent 87220a4
commit 6299945
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/trunk/NSMutableAttributedString+ORSCanaryAdditions.m b/trunk/NSMutableAttributedString+ORSCanaryAdditions.m
@@ -18,7 +18,7 @@ - (NSCharacterSet *) httpDelimitingCharset {
 	[charset addCharactersInString:@"±§$%^*(){}[];'\"\\|,<>`ÅÍÎÏ¡™£¢∞§¶"];
 	[charset addCharactersInString:@"•ªº≠œ∑´®†¥¨ˆøπ“‘åß∂ƒ©˙∆˚¬…æ«ÓÔ˘¿Â¯"];
 	[charset addCharactersInString:@"Ω≈ç√∫˜µ≤≥÷€‹›ﬁﬂ‡°·—Œ„´‰ˇÁ¨ˆØ∏”’˝ÒÚÆ"];
-	[charset addCharactersInString:@"»¸˛Ç◊ı˜"];
+	[charset addCharactersInString:@"»¸˛Ç◊ı˜!"];
 	return charset;
 }
 
@@ -56,6 +56,11 @@ - (NSCharacterSet *) hashtagDelimitingCharset {
 - (NSString *) detectURL:(NSString *)string {	
 	NSRange range;
 
+	range = [string rangeOfString:@"www.."];
+	if (range.location != NSNotFound) {
+		return nil;
+	}
+
 	range = [string rangeOfString:@"http://"];
 	if (range.location != NSNotFound) {
 		NSString *substring = [string substringFromIndex:range.location];
@@ -69,7 +74,7 @@ - (NSString *) detectURL:(NSString *)string {
 	}
 
 	range = [string rangeOfString:@"www."];
-	if (range.location != NSNotFound) {
+	if (range.location == 0) {
 		NSString *substring = [string substringFromIndex:range.location];
 		NSRange charsetRange = [substring 
 			rangeOfCharacterFromSet:[self httpDelimitingCharset]];