adium 2943:a19eed130d77: Context-loaded Twitter messages my havi...

commits at adium.im commits at adium.im
Mon Nov 23 04:20:27 UTC 2009


details:	http://hg.adium.im/adium/rev/a19eed130d77
revision:	2943:a19eed130d77
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.
(transplanted from 592152c93c30b4cf628636e96898c061919f9eba)

diffs (24 lines):

diff -r 739b63faac41 -r a19eed130d77 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);




More information about the commits mailing list