adium 2373:35088ef39369: Use our tr.im API key when creating URLs.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/35088ef39369
revision:	2373:35088ef39369
author:		Zachary West <zacw at adium.im>
date:		Thu May 28 14:25:04 2009 -0400

Use our tr.im API key when creating URLs.
Subject: adium 2374:32c6eb07d318: Add our pic.im API key, and use it correctly. Images are now uploaded correctly.

details:	http://hg.adium.im/adium/rev/32c6eb07d318
revision:	2374:32c6eb07d318
author:		Zachary West <zacw at adium.im>
date:		Thu May 28 14:25:29 2009 -0400

Add our pic.im API key, and use it correctly. Images are now uploaded correctly.

diffstat:

 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m |   2 ++
 Plugins/Image Uploading Plugin/AIPicImImageUploader.m  |  11 ++++++++---
 Source/AIURLShortenerPlugin.m                          |   2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 0b83ef1f230a -r 32c6eb07d318 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m
--- a/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m	Thu May 28 12:49:25 2009 -0400
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m	Thu May 28 14:25:29 2009 -0400
@@ -211,6 +211,8 @@
  */
 - (void)insertImageAddress:(NSString *)inAddress intoTextView:(NSTextView *)textView
 {	
+	NSParameterAssert(inAddress.length);
+	
 	NSRange selectedRange = textView.selectedRange;
 	
 	AILogWithSignature(@"Inserting %@ into text view", inAddress);
diff -r 0b83ef1f230a -r 32c6eb07d318 Plugins/Image Uploading Plugin/AIPicImImageUploader.m
--- a/Plugins/Image Uploading Plugin/AIPicImImageUploader.m	Thu May 28 12:49:25 2009 -0400
+++ b/Plugins/Image Uploading Plugin/AIPicImImageUploader.m	Thu May 28 14:25:29 2009 -0400
@@ -13,7 +13,7 @@
 #import <AIUtilities/AIProgressDataUploader.h>
 
 #define MULTIPART_FORM_BOUNDARY	@"bf5faadd239c17e35f91e6dafe1d2f96"
-#define PIC_IM_URL				@"http://api.tr.im/api/picim_url.xml"
+#define PIC_IM_URL				@"http://api.tr.im/api/picim_url.xml?api_key=zghQN6sv5y0FkLPNlQAopm7qDQz6ItO33ENU21OBsy3dL1Kl"
 
 @interface AIPicImImageUploader()
 - (id)initWithImage:(NSImage *)inImage
@@ -183,12 +183,17 @@
 
 - (void)parserDidEndDocument:(NSXMLParser *)parser
 {
-	NSDictionary *status = [[response objectForKey:@"trim"] objectForKey:@"status"];
+	NSDictionary *trim = [response objectForKey:@"trim"];
+	NSDictionary *status = [trim objectForKey:@"status"];
+	
+	NSLog(@"trim = %@", trim);
 	
 	if ([[status objectForKey:@"result"] isCaseInsensitivelyEqualToString:@"error"]) {
 		[uploader errorWithMessage:[status objectForKey:@"message"] forChat:chat];
+	} else if ([[status objectForKey:@"result"] isCaseInsensitivelyEqualToString:@"ok"]) {
+		[uploader uploadedURL:[[trim objectForKey:@"url"] objectForKey:@"value"] forChat:chat];
 	} else {
-		// TODO when api key :(
+		[uploader errorWithMessage:AILocalizedString(@"Unable to upload", nil) forChat:chat];
 	}
 }
 
diff -r 0b83ef1f230a -r 32c6eb07d318 Source/AIURLShortenerPlugin.m
--- a/Source/AIURLShortenerPlugin.m	Thu May 28 12:49:25 2009 -0400
+++ b/Source/AIURLShortenerPlugin.m	Thu May 28 14:25:29 2009 -0400
@@ -246,7 +246,7 @@
 			break;
 			
 		case AITrim:
-			request = [NSString stringWithFormat:@"http://api.tr.im/api/trim_simple?url=%@", [address stringByEncodingURLEscapes]];
+			request = [NSString stringWithFormat:@"http://api.tr.im/api/trim_simple?api_key=zghQN6sv5y0FkLPNlQAopm7qDQz6ItO33ENU21OBsy3dL1Kl&url=%@", [address stringByEncodingURLEscapes]];
 			break;
 			
 		default: