From 89af06d7e0575bcfc8234d3907161189c89ee4b3 Mon Sep 17 00:00:00 2001
From: Jeena Paradies <spam@jeenaparadies.net>
Date: Tue, 7 Jun 2011 10:54:44 +0200
Subject: [PATCH] changed so new tweets are send via JavaScript

---
 Controller.m   |  6 +++---
 TwittiaCore.js | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Controller.m b/Controller.m
index e6c074e..94b7c5a 100644
--- a/Controller.m
+++ b/Controller.m
@@ -155,8 +155,6 @@
 	NSRange range = [aString rangeOfString:@"oauth_token"];
 	
 	if (range.length > 0) {
-		NSLog(@"test 3 %@", oauth);
-
 		[oauth requestAccessToken];
 	} else {
 		MyDocument *newTweet = (MyDocument *)[[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:YES error:nil];
@@ -172,7 +170,9 @@
 
 - (IBAction)sendTweet:(id)sender {
 	TweetModel *tweet = (TweetModel *)[sender object];
-	[oauth updateTweet:tweet.text inReplaToStatus:tweet.inReplyTostatusId];
+	//[oauth updateTweet:tweet.text inReplaToStatus:tweet.inReplyTostatusId];
+    NSString *func = [NSString stringWithFormat:@"twittia_instance.sendNewTweet(\"%@\", \"%@\")", [tweet.text stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""], tweet.inReplyTostatusId];
+    [timelineView stringByEvaluatingJavaScriptFromString:func];
 }
 
 - (NSString *)pluginURL {
diff --git a/TwittiaCore.js b/TwittiaCore.js
index 39ab3a0..e9a64b6 100644
--- a/TwittiaCore.js
+++ b/TwittiaCore.js
@@ -7,6 +7,7 @@
 //
 
 API_PATH = "http://api.twitter.com/1/";
+WEBSITE_PATH = "http://twitter.com/";
 //API_PATH = "http://identi.ca/api/";
 
 function Twittia(action) {
@@ -90,7 +91,7 @@ Twittia.prototype.getItem = function(status) {
 	
 	if(status.in_reply_to_status_id != null) template.in_reply.innerText = status.in_reply_to_screen_name;
 	else template.in_reply.parentNode.className = "hidden";
-	template.in_reply.href = API_PATH + status.in_reply_to_screen_name + "/status/" + status.in_reply_to_status_id;
+	template.in_reply.href = WEBSITE_PATH + status.in_reply_to_screen_name + "/status/" + status.in_reply_to_status_id;
 
 	template.message.innerHTML = replaceTwitterLinks(replaceURLWithHTMLLinks(status.text));
 	
@@ -100,7 +101,7 @@ Twittia.prototype.getItem = function(status) {
 	time.className = "timeago";
 	$(time).timeago();
 	template.ago.appendChild(time);
-	template.ago.href = API_PATH +  status.user.screen_name + "/status/" + status.id_str;
+	template.ago.href = WEBSITE_PATH +  status.user.screen_name + "/status/" + status.id_str;
 	
 	// {"type":"Point","coordinates":[57.10803113,12.25854746]}
 	if (status.geo && status.geo.type == "Point") {
@@ -249,10 +250,10 @@ Twittia.prototype.getNewData = function(supress_new_with_timeout) {
 	);
 }
 
-/*
+
 Twittia.prototype.sendNewTweet = function(tweet, in_reply_to_status_id) {
 	
-	var url = "http://api.twitter.com/1/statuses/update.json";
+	var url = API_PATH + "statuses/update.json";
 	var data = "source=twittia&status=" + OAuth.percentEncode(tweet);
 	if(in_reply_to_status_id != '') data += "&in_reply_to_status_id=" + in_reply_to_status_id
 		
@@ -287,7 +288,7 @@ Twittia.prototype.sendNewTweet = function(tweet, in_reply_to_status_id) {
 		}
 	});
 }
-*/
+
 
 Twittia.prototype.retweet = function(status_id, item) {
 	var url = API_PATH + "statuses/retweet/" + status_id + ".json";