Merge lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

[Eduardo Mucelli Rezende Oliveira]

Twitter: Informing the user if the tweet is longer than 140 characters

[Matthieu Baerts (matttbe)]

It works fine :)
Thank you!

review: Approve

=== modified file 'Twitter/Twitter'
--- Twitter/Twitter	2012-03-22 14:32:26 +0000
+++ Twitter/Twitter	2012-04-03 19:39:20 +0000
@@ -332,16 +332,23 @@
 
   def ask_for_direct_message_reply(self, destinatary):
     dialog = {'buttons':'ok;cancel'}
-    widget = {'widget-type':'text-entry', 'nb-chars':141}                           # 140 characters max, a direct message
+    widget = {'widget-type':'text-entry', 'nb-chars':self.tweet_length + 1}         # 140 characters max, a direct message
     self.show_popup_message((_("%s, write a reply to %s")) % (self.user.screen_name, destinatary), dialog, widget)
     self.dialog_type = self.responding_sending_direct_message_reply
     self.replying_direct_message_to = destinatary
 
-  def ask_for_tweet(self):
+  # Opens the dialog to be filled with the tweet and also
+  # informs about tweet longer than 140 characters
+  def ask_for_tweet(self, default="", warning=False):
     dialog = {'buttons':'ok;cancel'}
-    widget = {'widget-type':'text-entry', 'nb-chars':141}                           # 140 characters max, a tweet :)
-    self.show_popup_message((_("%s, send a tweet")) % self.user.screen_name, dialog, widget)
-    self.dialog_type = self.responding_tweet
+    widget = {'widget-type':'text-entry', 'nb-chars':self.tweet_length + 1, 'initial-value':default}  # 140 characters max, a tweet :)
+    if not warning:
+      message = _("%s, send a tweet") % self.user.screen_name
+      self.dialog_type = self.responding_tweet
+    else:                                                                                             # user entered more than 140 characters
+      message = _("Your tweet has more than %d characters, please make it shorter") % self.tweet_length
+      self.dialog_type = self.responding_tweet
+    self.show_popup_message(message, dialog, widget)
     
   def ask_for_retweet(self, tweet_id):
     dialog = {'buttons':'ok;cancel'}
@@ -480,6 +487,8 @@
     self.tweets_menu_id           = 3000
     self.user_timeline_menu_id    = 4000
     
+    self.tweet_length             = 140
+    
     self.tweet_stream   = Queue.Queue()
     self.message_stream = Queue.Queue()
 
@@ -527,8 +536,11 @@
         else:
           logm("A problem has occurred while getting access to the API")
       elif self.dialog_type == self.responding_tweet:
-        logp("Sending a tweet '%s'" % content)
-        self.api.tweet(content)
+        if len(content) > self.tweet_length:
+            self.ask_for_tweet(content, True)
+        else:
+          logp("Sending a tweet '%s'" % content)
+          self.api.tweet(content)
       elif self.dialog_type == self.responding_sending_direct_message_reply:
         logp("Sending a direct message '%s'" % content)
         self.api.new_direct_message(content, self.replying_direct_message_to)