adium-1.4 2794:592152c93c30: Context-loaded Twitter messages my ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/592152c93c30
revision:	2794:592152c93c30
author:		Zachary West <zacw at adium.im>
date:		Sun Nov 22 23:19:26 2009 -0500

Context-loaded Twitter messages my having '&' instead of '&'. This is valid, but we weren't considering it.

diffs (24 lines):

diff -r f23c6c342e18 -r 592152c93c30 Plugins/Twitter Plugin/AITwitterURLHandler.m
--- a/Plugins/Twitter Plugin/AITwitterURLHandler.m	Sun Nov 22 23:07:12 2009 -0500
+++ b/Plugins/Twitter Plugin/AITwitterURLHandler.m	Sun Nov 22 23:19:26 2009 -0500
@@ -66,11 +66,16 @@
 		return;
 	}
 	
+	NSString *delimiter = @"&";
+	if ([urlString rangeOfString:@"&"].location != NSNotFound) {
+		delimiter = @"&";
+	}
+	
 	NSString *inUser = [url host];
-	NSString *inAction = [url queryArgumentForKey:@"action" withDelimiter:@"&"] ?: @"reply";
-	NSString *inTweet = [url queryArgumentForKey:@"status" withDelimiter:@"&"];
-	NSString *inDM = [url queryArgumentForKey:@"dm" withDelimiter:@"&"];
-	NSString *inMessage = [url queryArgumentForKey:@"message" withDelimiter:@"&"];
+	NSString *inAction = [url queryArgumentForKey:@"action" withDelimiter:delimiter] ?: @"reply";
+	NSString *inTweet = [url queryArgumentForKey:@"status" withDelimiter:delimiter];
+	NSString *inDM = [url queryArgumentForKey:@"dm" withDelimiter:delimiter];
+	NSString *inMessage = [url queryArgumentForKey:@"message" withDelimiter:delimiter];
 	NSString *inAccount = [url user];
 	
 	AILogWithSignature(@"Twitter Reply requested: %@", url);