Merge lp:~psquid/heybuddy/api_redent into lp:heybuddy

[Psychedelic Squid]

[Psychedelic Squid (psquid)]

Sorry about all the merge requests, but the code's done, so there's no reason I can see _not_ to request merges.

[jezra (jezra)]

I would prefer that anything referring to the retweet API contain "retweet" in the name. That way, when I get angry, I can let everyone know how much I don't like twitter

[Psychedelic Squid (psquid)]

----- Original message -----
> I would prefer that anything referring to the retweet API contain
> "retweet" in the name. That way, when I get angry, I can let everyone
> know how much I don't like twitter --
> https://code.launchpad.net/~psquid/heybuddy/api_redent/+merge/60010 You
> are the owner of lp:~psquid/heybuddy/api_redent.

Fine by me. If it gets in, I honestly don't care what it's called. :)

[lp:~psquid/heybuddy/api_redent]

271. By Psychedelic Squid on 2011-05-05

Amended all added code (but not the fixed code - terminology has been left as it was there) to refer to retweet API, rather than repeat/redent.

[jezra (jezra)]

What is an API? I know, and you know, but will a new user know? or will a new user just see that heybuddy's default is superior to the twitter compatible crap?

[lp:~psquid/heybuddy/api_redent]

272. By Psychedelic Squid on 2011-05-06

Set default option value of api_retweet as False.

[Psychedelic Squid (psquid)]

I was kinda intending for it to be an option that you probably don't want to turn on anyway if you don't know what it means.

The other possibility is to change the description to something like "Use shitty twitter-style retweets for redenting" (wording could probably be improved).

Unmerged revisions

272. By Psychedelic Squid on 2011-05-06

Set default option value of api_retweet as False.

271. By Psychedelic Squid on 2011-05-05

Amended all added code (but not the fixed code - terminology has been left as it was there) to refer to retweet API, rather than repeat/redent.

270. By Psychedelic Squid on 2011-05-05

Add support for using the repeat API to redent, and fix the send_redent method to behave correctly.

=== modified file 'Communicator.py'
--- Communicator.py	2011-03-11 20:33:23 +0000
+++ Communicator.py	2011-05-06 04:52:12 +0000
@@ -91,6 +91,10 @@
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 							 (gobject.TYPE_STRING,)
 			),
+		'redent-statusXML': (
+			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+							 (gobject.TYPE_STRING,)
+			),
 		'block-createXML': (
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 							 (gobject.TYPE_STRING,)
@@ -284,12 +288,14 @@
 		#add this request to the front of the communication queue
 		self.queue.append( (request,'new-statusXML',None) )
 
-
 	def send_redent(self,status_id):
-		url="%s/statuses/retweet/%s.xml" % (self.apiroot,status_id)
+		url="%s/statuses/retweet.xml" % (self.sapiroot)
+		data={"id":status_id}
+		encoded_data =urlencode(data)
 		#print url
-		request = urllib2.Request(url,encoded_data)
-		self.process_httprequest(request,'redent-statusXML')
+		request = urllib2.Request(url, encoded_data)
+		request.add_header("Authorization", self.authheader)
+		self.queue.append( (request,'redent-statusXML',None) )
 	
 	def block_create(self,user_id):
 		url="%s/blocks/create.xml?user_id=%s" % (self.sapiroot,user_id)

=== modified file 'SettingsPage.py'
--- SettingsPage.py	2011-04-11 18:31:17 +0000
+++ SettingsPage.py	2011-05-06 04:52:12 +0000
@@ -17,6 +17,10 @@
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 						 (gobject.TYPE_BOOLEAN,)
 		),
+		'option-api-retweet': (
+			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+						 (gobject.TYPE_BOOLEAN,)
+		),
 		'option-ctrl-enter': (
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 						 (gobject.TYPE_BOOLEAN,)
@@ -120,6 +124,9 @@
 		self.ctrl_enter = gtk.CheckButton(_("CTRL+Enter submits status"))
 		self.ctrl_enter.connect("toggled", self.option_toggled,'option-ctrl-enter')
 		
+		self.api_retweet = gtk.CheckButton(_("Use retweet API for redents"))
+		self.api_retweet.connect("toggled", self.option_toggled,'option-api-retweet')
+		
 		self.enable_notifications = gtk.CheckButton(_("Enable notifications"))
 		self.enable_notifications.connect("toggled", self.option_toggled,'option-notifications')
 		self.enable_notify_replies = gtk.CheckButton(_("Enable @replies notifications"))
@@ -128,6 +135,7 @@
 		options_box.pack_start(self.ctrl_enter,False,False,0)
 		options_box.pack_start(self.context_back_asswards,False,False,0)
 		options_box.pack_start(self.disable_avatars,False,False,0)
+		options_box.pack_start(self.api_retweet,False,False,0)
 		#does the app have notifications?
 		if has_pynotify:
 			options_box.pack_start(self.enable_notifications,False,False,0)
@@ -224,6 +232,9 @@
 	def set_ctrl_enter(self,boolean):
 		self.ctrl_enter.set_active(boolean)
 
+	def set_api_retweet(self,boolean):
+		self.api_retweet.set_active(boolean)
+
 
 	#More Code for notifications			
 	def set_notifications(self,boolean):

=== modified file 'heybuddy.py'
--- heybuddy.py	2011-05-05 04:54:00 +0000
+++ heybuddy.py	2011-05-06 04:52:12 +0000
@@ -92,7 +92,7 @@
 		self.conversation_id="0"
 		#keep track of the filters
 		self.filters ={'users':[],'strings':[]}
-		self.options={'run_as_tray_app':False,'context_backwards':False,'no_avatars':False,'notifications':True,'notify_replies':False}
+        self.options={'run_as_tray_app':False,'context_backwards':False,'no_avatars':False,'notifications':True,'notify_replies':False,'api_retweet':False}
 		#keep track of the direct_message requests
 		self.last_direct_message_time=0
 		#something something direct message
@@ -145,6 +145,7 @@
 		self.comm.connect('userXML',self.process_userXML)
 		self.comm.connect('groupXML',self.process_groupXML)
 		self.comm.connect('new-statusXML',self.process_new_statusXML)
+		self.comm.connect('redent-statusXML',self.process_new_statusXML)
 		self.comm.connect('user_is_friendXML',self.process_user_is_friendXML)
 		self.comm.connect('user_is_memberXML',self.process_user_is_memberXML)
 		self.comm.connect('friendshipXML',self.process_friendshipXML)
@@ -284,6 +285,8 @@
 		self.settingspage.set_context_backwards( self.options['context_backwards'] )
 		self.options['no_avatar']= self.conf.get_bool_option('no_avatars')
 		self.settingspage.set_no_avatars( self.options['no_avatar'] )
+		self.options['api_retweet'] = self.conf.get_bool_option('api_retweet')
+		self.settingspage.set_api_retweet( self.options['api_retweet']	)
 		self.options['notifications']= self.conf.get_bool_option('notifications')
 		self.settingspage.set_notifications( self.options['notifications'] )
 		self.options['notify_replies']= self.conf.get_bool_option('notify_replies')
@@ -296,6 +299,7 @@
 		self.settingspage.connect('option-ctrl-enter', self.option_changed, 'ctrl_enter')
 		self.settingspage.connect('option-context-backwards',self.option_changed, 'context_backwards')
 		self.settingspage.connect('option-no-avatars',self.option_changed, 'no_avatars')
+		self.settingspage.connect('option-api-retweet', self.option_changed, 'api_retweet')
 		self.settingspage.connect('option-notifications',self.option_changed, 'notifications')
 		self.settingspage.connect('option-notify-replies',self.option_changed, 'notify_replies')
 		self.settingspage.connect('initial-dents',self.set_initial_dents)
@@ -992,11 +996,14 @@
 			self.mainwindow.set_ctrl_enter(value)
 		 
 	def redent_clicked(self,dent,name,text):
-		self.respond_to_id=dent.id
-		#formatted_text= u'\u267A @%s: %s' % (name,text)
-		formatted_text= u'\u267A @%s: %s' % (name,text)
-		self.mainwindow.update_textbuffer.set_text(formatted_text )
-		self.mainwindow.update_textview.grab_focus()
+		if self.options['api_retweet']:
+			self.comm.send_redent(dent.id)
+		else:
+			self.respond_to_id=dent.id
+			#formatted_text= u'\u267A @%s: %s' % (name,text)
+			formatted_text= u'\u267A @%s: %s' % (name,text)
+			self.mainwindow.update_textbuffer.set_text(formatted_text )
+			self.mainwindow.update_textview.grab_focus()
 	 
 	def view_group(self,widget,group_name):
 		#where were we?