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

[Eduardo Mucelli Rezende Oliveira]

Twitter: Updated twitter api to the version 1.1

[lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter]

379. By Eduardo Mucelli Rezende Oliveira on 2013-08-08

Updating Twitter to the API 1.1

[Eduardo Mucelli Rezende Oliveira (eduardo-mucelli)]

Matttbe, are you guys still using the lastmodif file? If so, is the format YYYYMMDD or YYYYDDMM? I always forget to update it.

[Matthieu Baerts (matttbe)]

Hello Eduardo and thank you for these modifications ;)

It looks fine (even if I'm not able to test it right now ;) ).

We are still using 'last-modif' file but this file is managed by the dock, no need to modify it ;) (it's used to know if the dock has to update this applet or not).
But is it possible to modify the 'last-modif' entry of your Twitter applet in 'list.conf' file too? We regularly forgot it :)
Format is YYYYMMDD (this number has to be bigger each day)

Then, you can push your modifications on the main branch ;)
(or I can do that if you prefer)

Also: here is just a 2 tips/advices (mostly details):
 * About the commit message, it's maybe better to start it with the name of the applet (just "Twitter: Updating (...)") => For more advices about the commit message, please have a look there: http://www.glx-dock.org/ww_page.php?p=Help%20us%20with%20BZR&lang=en#18-About%20the%20commit%20message
 * No need to bump the version number of your applet if you don't change the .conf file (but you can do that if you want to have a detailed changelog for each modification but you can also have a version number and a lot of changes and in your ChangeLog file, you can add the date ;) )

Have a nice day,

Matt

review: Needs Fixing

[Matthieu Baerts (matttbe)]

Hello Eduardo,

I re-post a new comment just because I know that these mails you receive about these merge requests are not so clear (I think you already told me that you didn't see previous comments that I made here :) )

So it's just to know if you saw my previous comment :) (and if you prefer that I answer to your question on Cairo-Dock's forum, here or by e-mails)

[Eduardo Mucelli Rezende Oliveira (eduardo-mucelli)]

Heya! I see your comments by e-mail. Actually I misunderstood your previous comment, and neglected the list.conf change. I will do it as soon as I get back home.

The commit message ... yes, I always forget it. I end up adding the applet name only on the merge message. Anyway, I will try my best to remember next times, promised :-)

The .conf file, ok, got it. I will keep tracking inside Changelog and let the version static until I change something inside .conf.

Cheers!

[Matthieu Baerts (matttbe)]

Ok, thank you :)

About the commit message, yes, it's a detail, it's not so important ;) but it's just... better :P

review: Approve

=== modified file 'Twitter/ChangeLog'
--- Twitter/ChangeLog	2012-05-20 12:59:43 +0000
+++ Twitter/ChangeLog	2013-08-07 20:36:26 +0000
@@ -1,3 +1,4 @@
+0.4.4 (August/7/2013): Converted twitter API to the version 1.1.
 0.4.1 (May/20/2012): Added home timeline on Identi.ca.
 0.4: (May/18/2012): Fully supporting individually account log-in. Code improvements, refactoring, and bug fixes.
 0.3: (May/13/2012): Added support to Identi.ca! Many code changes, refactoring, and improving.
 
=== modified file 'Twitter/Twitter.conf'
--- Twitter/Twitter.conf	2012-11-05 14:51:51 +0000
+++ Twitter/Twitter.conf	2013-08-07 20:36:26 +0000
@@ -1,4 +1,4 @@
-#0.4.3
+#0.4.4
 
 #[gtk-about]
 [Icon]
 
=== modified file 'Twitter/auto-load.conf'
--- Twitter/auto-load.conf	2012-11-05 14:51:51 +0000
+++ Twitter/auto-load.conf	2013-08-07 20:36:26 +0000
@@ -10,7 +10,7 @@
 category = 3
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.4.3
+version = 0.4.4
 
 # Whether the applet can be instanciated several times or not.
 multi-instance = true
 
=== modified file 'Twitter/twitter.py'
--- Twitter/twitter.py	2013-02-28 00:04:13 +0000
+++ Twitter/twitter.py	2013-08-07 20:36:26 +0000
@@ -101,7 +101,7 @@
     def __init__(self, access_key, access_secret, callback):
       Twitter.API.__init__(self, access_key, access_secret)
 
-      self.user_stream_url = "https://userstream.twitter.com/2/user.json"
+      self.user_stream_url = "https://userstream.twitter.com/1.1/user.json"
       self.callback = callback                                                        # called as soon as a new entry on the stream appears
       thread = threading.Thread(target=self.tweet_streaming)                          # keep checking for new entries on the stream
       thread.start()                                                                  # run, forrest run
@@ -126,22 +126,25 @@
         if len(tweets) > 1:
           content = tweets[0]
           if "text" in content:
-            content = simplejson.loads(content)
-            logp("Received from Twitter Stream: %s" % content)
-            self.callback(content)                                      # callback == Twitter.on_receive_new_entry_into_stream_callback
+            try:
+              content = simplejson.loads(content)
+              logp("Received from Twitter Stream: %s" % content)
+              self.callback(content)                                    # callback == Twitter.on_receive_new_entry_into_stream_callback
+            except ValueError:                                          # in some strange circumstances the content may not be a valid json 
+              pass
           buffer = tweets[1]
    
   class TwitterAPI(API):
     def __init__(self, access_key, access_secret):
       Twitter.API.__init__(self, access_key, access_secret)
       
-      self.update_url               = 'https://api.twitter.com/1/statuses/update.json'
-      self.home_timeline_url        = 'https://api.twitter.com/1/statuses/home_timeline.json'
-      self.direct_messages_url      = 'https://api.twitter.com/1/direct_messages.json'
-      self.new_direct_messages_url  = 'https://api.twitter.com/1/direct_messages/new.json'
-      self.verify_credentials_url   = 'https://api.twitter.com/1/account/verify_credentials.json'
-      self.user_timeline_url        = 'https://api.twitter.com/1/statuses/user_timeline.json'
-      self.retweet_url_prefix       = 'https://api.twitter.com/1/statuses/retweet/'            # lacks the id of the tweet to be retweeted
+      self.update_url               = 'https://api.twitter.com/1.1/statuses/update.json'
+      self.home_timeline_url        = 'https://api.twitter.com/1.1/statuses/home_timeline.json'
+      self.direct_messages_url      = 'https://api.twitter.com/1.1/direct_messages.json'
+      self.new_direct_messages_url  = 'https://api.twitter.com/1.1/direct_messages/new.json'
+      self.verify_credentials_url   = 'https://api.twitter.com/1.1/account/verify_credentials.json'
+      self.user_timeline_url        = 'https://api.twitter.com/1.1/statuses/user_timeline.json'
+      self.retweet_url_prefix       = 'https://api.twitter.com/1.1/statuses/retweet/'            # lacks the id of the tweet to be retweeted
       
     def dispatch(self, url, mode, parameters={}):
       oauth_request = oauth.OAuthRequest.from_consumer_and_token(self.consumer,