cairo-dock-team team mailing list archive
-
cairo-dock-team team
-
Mailing list archive
-
Message #03692
[Merge] lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter into lp:cairo-dock-plug-ins-extras
Eduardo Mucelli Rezende Oliveira has proposed merging lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter into lp:cairo-dock-plug-ins-extras.
Requested reviews:
Cairo-Dock Team (cairo-dock-team)
For more details, see:
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter/+merge/98119
Possible to retweet tweets. Tweets being shown with standard menu.
--
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter/+merge/98119
Your team Cairo-Dock Team is requested to review the proposed merge of lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Twitter into lp:cairo-dock-plug-ins-extras.
=== modified file 'Twitter/ChangeLog'
--- Twitter/ChangeLog 2012-03-18 17:07:23 +0000
+++ Twitter/ChangeLog 2012-03-19 00:07:21 +0000
@@ -1,3 +1,4 @@
+0.2: (March/19/2012): Possible to retweet tweets. Tweets being shown with standard menu.
0.1.4: (March/18/2012): Alerts for new direct messages arriving on the stream, possible to answer them. Organizing the menus for new/all tweets, and messages. Play alert sound when tweet/message arrives on the stream.
0.1.3: (March/14/2012): Direct messages are shown in a gtk-based menu, and it is possible to reply them. Fixing the post method, and the stream callback.
0.1.2: (March/8/2012): Adding the emblem maker to inform the number of new tweets from the stream.
=== modified file 'Twitter/Twitter'
--- Twitter/Twitter 2012-03-18 17:07:23 +0000
+++ Twitter/Twitter 2012-03-19 00:07:21 +0000
@@ -23,15 +23,18 @@
# Paste this number on the next dialog box will be shown.
# The plugin is going to inform that you are successfully connected.
-# To see the received tweets right-click on the icon -> Twitter -> [New] tweets.
-# To see the received direct messages right-click on the icon -> Twitter -> [New] direct messages. You can reply one of them just by left-clicking on it.
+# To see the received tweets right-click on the icon -> Twitter -> [New] tweets. You can retweet any of them by left-clicking on it.
+# To see the received direct messages right-click on the icon -> Twitter -> [New] direct messages. You can reply any of them by left-clicking on it.
# To see some user's info right-click on the icon -> Twitter -> Info
import os, webbrowser, simplejson, threading, Queue, urllib2
from oauth import oauth
+from util import *
+
from http import post, get #, stream
-from util import *
import emblem, menu
+from message import DirectMessage, Tweet
+
from CDApplet import CDApplet, _
# TODO import ConfigParser later conver files to config syntax
@@ -127,6 +130,7 @@
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 = 'http://api.twitter.com/1/statuses/user_timeline.json'
+ self.retweet_url_prefix = 'http://api.twitter.com/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,
@@ -143,15 +147,20 @@
header = oauth_request.to_header()
post(url, parameters, header)
- def tweet(self, message): # popularly "send a tweet"
+ def tweet(self, message): # popularly "send a tweet"
self.dispatch(self.update_url, "POST", {'status':message})
+
+ def retweet(self, tweet_id):
+ url = "%s%s.json" % (self.retweet_url_prefix, tweet_id)
+ self.dispatch(url, "POST")
def new_direct_message(self, message, destinatary):
self.dispatch(self.new_direct_messages_url, "POST", {'text':message, 'screen_name':destinatary})
def home_timeline(self):
return self.dispatch(self.home_timeline_url, "GET")
-
+
+ #TODO: Use it.
def user_timeline(self):
return self.dispatch(self.user_timeline_url, "GET")
@@ -161,11 +170,6 @@
def verify_credentials(self):
return self.dispatch(self.verify_credentials_url, "GET")
-class Message:
- def __init__(self, text, sender):
- self.text = text
- self.sender = sender
-
class User:
def __init__(self, screen_name="", access_key="", access_secret=""):
self.screen_name = screen_name
@@ -188,31 +192,46 @@
# This method is a callback that is called as soon as a new entry arrives on the stream
# The method is passed as parameter when creating the instance for the TwitterStreamAPI
# TwitterStreamAPI(access_key, access_secret, self.on_receive_new_entry_into_stream_callback)
- # TODO: Make available an "Animation" option upon a new entry arrival
+ # TODO: Make configurable the alerts, sound, animation, etc
def on_receive_new_entry_into_stream_callback(self, entry):
if 'user' in entry: # tweet
if not entry['user']['screen_name'] == self.user.screen_name: # not sent by the own user
logp("Inserting new tweet on the stream Queue: %s" % entry)
self.tweet_stream.put(entry) # put the new tweet on the stream queue
+ self.emblem.update(self.tweet_stream.qsize() + self.message_stream.qsize()) # create the emblem with the counter
+ self.icon.SetEmblem(self.emblem.emblem, CDApplet.EMBLEM_TOP_RIGHT + CDApplet.EMBLEM_PERSISTENT) # add emblem
self.play_alert_sound()
elif 'direct_message' in entry: # direct messages
if not entry['direct_message']['sender']['screen_name'] == self.user.screen_name: # not sent by the own user
logp("Inserting new message on the message Queue: %s" % entry)
self.message_stream.put(entry) # put the new message on the message queue
+ self.emblem.update(self.tweet_stream.qsize() + self.message_stream.qsize()) # create the emblem with the counter
+ self.icon.SetEmblem(self.emblem.emblem, CDApplet.EMBLEM_TOP_RIGHT + CDApplet.EMBLEM_PERSISTENT) # add emblem
self.play_alert_sound()
- self.emblem.update(self.tweet_stream.qsize() + self.message_stream.qsize()) # create the emblem with the counter
- self.icon.SetEmblem(self.emblem.emblem, CDApplet.EMBLEM_TOP_RIGHT + CDApplet.EMBLEM_PERSISTENT) # add emblem
-
# TODO: Use the Menu class
+ def show_user_timeline(self):
+ self.inform_start_of_waiting_process()
+ timeline = self.api.user_timeline()
+ if len(timeline) > 0:
+ message = "".join (["[<b>%s</b>] %s\n" % (status['user']['screen_name'], status['text']) for status in timeline])
+ else:
+ message = _("Oh, dear, your timeline is empty :-(")
+ dialog = {'use-markup':True}
+ self.inform_end_of_waiting_process()
+ self.show_popup_message(message, dialog)
+
def show_new_tweets(self):
self.inform_start_of_waiting_process()
- message = ''
+
+ nt_menu = menu.Menu(self.icon, self.on_tweet_list_menu_clicked)
while not self.tweet_stream.empty(): # iterate on the stream composing the message
tweet = self.tweet_stream.get()
- message += "[<b>%s</b>] %s\n" % (tweet['user']['name'], tweet['text'])
- dialog = {'use-markup':True}
- self.inform_end_of_waiting_process()
+ text = tweet['text']
+ sender = tweet['user']['name']
+ uid = tweet['id_str']
+ nt_menu.add(Tweet(text, sender, uid))
+ nt_menu.pop_up()
if self.message_stream.empty(): # if there are not new messages, erase the emblem
self.icon.SetEmblem("", CDApplet.EMBLEM_TOP_RIGHT)
@@ -220,41 +239,37 @@
self.emblem.update(self.message_stream.qsize()) # update the emblem for the direct messages counter
self.icon.SetEmblem(self.emblem.emblem, CDApplet.EMBLEM_TOP_RIGHT + CDApplet.EMBLEM_PERSISTENT)
- self.show_popup_message(message, dialog)
-
- # TODO: Use the Menu class
- def show_user_timeline(self):
- self.inform_start_of_waiting_process()
- timeline = self.api.user_timeline()
- if len(timeline) > 0:
- message = "".join (["[<b>%s</b>] %s\n" % (status['user']['screen_name'], status['text']) for status in timeline])
- else:
- message = _("Oh, dear, your timeline is empty :-(")
- dialog = {'use-markup':True}
self.inform_end_of_waiting_process()
- self.show_popup_message(message, dialog)
- # TODO: Use the Menu class
def show_home_timeline(self):
self.inform_start_of_waiting_process()
+
timeline = self.api.home_timeline()
if len(timeline) > 0:
- message = "".join (["[<b>%s</b>] %s\n" % (status['user']['screen_name'], status['text']) for status in timeline])
+ ht_menu = menu.Menu(self.icon, self.on_tweet_list_menu_clicked)
+ for status in timeline:
+ text = status['text']
+ sender = status['user']['screen_name']
+ uid = status['id_str']
+ ht_menu.add(Tweet(text, sender, uid))
+ ht_menu.pop_up()
else:
message = _("Oh, dear, your timeline is empty :-(")
- dialog = {'use-markup':True}
+ dialog = {'use-markup':True}
+ self.show_popup_message(message, dialog)
+
self.inform_end_of_waiting_process()
- self.show_popup_message(message, dialog)
def show_new_direct_messages(self):
self.inform_start_of_waiting_process()
- itens =[]
+ dm_menu = menu.Menu(self.icon, self.on_direct_messages_list_menu_clicked)
while not self.message_stream.empty(): # iterate on the stream composing the message
direct_message = self.message_stream.get()
- itens.append(Message(direct_message['direct_message']['text'], direct_message['direct_message']['sender']['screen_name']))
- direct_messages_list_menu = menu.Menu(itens, self.on_direct_messages_list_menu_clicked)
- direct_messages_list_menu.pop_up(self.icon)
+ text = direct_message['direct_message']['text']
+ sender = direct_message['direct_message']['sender']['screen_name']
+ dm_menu.add(DirectMessage(text, sender))
+ dm_menu.pop_up()
if self.tweet_stream.empty(): # if there are not new tweets, erase the emblem
self.icon.SetEmblem("", CDApplet.EMBLEM_TOP_RIGHT)
@@ -268,12 +283,13 @@
self.inform_start_of_waiting_process()
messages = self.api.direct_messages()
- itens = []
-
if len(messages) > 0:
- ([itens.append(Message(status['text'], status['sender']['screen_name'])) for status in messages])
- direct_messages_list_menu = menu.Menu(itens, self.on_direct_messages_list_menu_clicked)
- direct_messages_list_menu.pop_up(self.icon)
+ dm_menu = menu.Menu(self.icon, self.on_direct_messages_list_menu_clicked)
+ for status in messages:
+ text = status['text']
+ sender = status['sender']['screen_name']
+ dm_menu.add(DirectMessage(text, sender))
+ dm_menu.pop_up()
else:
dialog = {'use-markup':True}
message = _("Oh, dear, you do not have direct messages :-(")
@@ -282,7 +298,25 @@
self.inform_end_of_waiting_process()
def on_direct_messages_list_menu_clicked(self, widget):
- self.ask_for_direct_message_reply(widget.get_label()) # label holds the sender of the message, reply to him/her now
+ self.ask_for_direct_message_reply(widget.get_label()) # label contains the sender of the message, reply to him/her now
+
+ def on_tweet_list_menu_clicked(self, widget):
+ self.ask_for_retweet(widget.get_label()) # label contains the id of the tweet needed to retweet it
+
+ def tweet(self, message): # popularly "send a tweet"
+ self.inform_start_of_waiting_process()
+ self.api.update_status(message)
+ self.inform_end_of_waiting_process()
+
+ def show_credentials(self):
+ self.inform_start_of_waiting_process()
+ credentials = self.api.verify_credentials()
+ message = _("%s [<b>%s</b>]\nFollowers: %s\nFriends: %s\nTweets: %s\n") % (credentials['name'], credentials['screen_name'], credentials['followers_count'], credentials['friends_count'], credentials['statuses_count'])
+ dialog = {'use-markup':True}
+ self.inform_end_of_waiting_process()
+ self.show_popup_message(message, dialog)
+
+ # Applet methods
def ask_for_direct_message_reply(self, destinatary):
dialog = {'buttons':'ok;cancel'}
@@ -291,26 +325,17 @@
self.dialog_type = self.responding_sending_direct_message_reply
self.replying_direct_message_to = destinatary
- def tweet(self, message): # popularly "send a tweet"
- self.inform_start_of_waiting_process()
- self.api.update_status(message)
- self.inform_end_of_waiting_process()
-
- def show_credentials(self):
- self.inform_start_of_waiting_process()
- credentials = self.api.verify_credentials()
- message = _("%s [<b>%s</b>]\nFollowers: %s\nFriends: %s\nTweets: %s\n") % (credentials['name'], credentials['screen_name'], credentials['followers_count'], credentials['friends_count'], credentials['statuses_count'])
- dialog = {'use-markup':True}
- self.inform_end_of_waiting_process()
- self.show_popup_message(message, dialog)
-
- # Applet methods
-
def ask_for_tweet(self):
dialog = {'buttons':'ok;cancel'}
widget = {'widget-type':'text-entry', 'nb-chars':140} # 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
+
+ def ask_for_retweet(self, tweet_id):
+ dialog = {'buttons':'ok;cancel'}
+ self.show_popup_message((_("%s, retweet?")) % self.user.screen_name, dialog)
+ self.dialog_type = self.responding_retweet
+ self.retweet_tweet_id = tweet_id
# TODO: Implement it as a config file using screen_name as section index
def read_user_data(self):
@@ -422,7 +447,7 @@
(self.responding_screen_name, self.responding_authorization, self.responding_pin,
self.responding_success, self.responding_tweet, self.responding_initial_informations,
- self.responding_sending_direct_message_reply) = range(7)
+ self.responding_sending_direct_message_reply, self.responding_retweet) = range(8)
self.dialog_type = None
self.emblem = emblem.Emblem() # emblem maker, see emblem.py
@@ -479,6 +504,9 @@
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)
+ elif self.dialog_type == self.responding_retweet:
+ logp("Retweeting")
+ self.api.retweet(self.retweet_tweet_id)
def on_click(self, key):
self.ask_for_tweet()
=== modified file 'Twitter/Twitter.conf'
--- Twitter/Twitter.conf 2012-03-18 17:07:23 +0000
+++ Twitter/Twitter.conf 2012-03-19 00:07:21 +0000
@@ -1,4 +1,4 @@
-#!en;0.1.4
+#!en;0.2
#[gtk-about]
[Icon]
=== modified file 'Twitter/auto-load.conf'
--- Twitter/auto-load.conf 2012-03-18 17:07:23 +0000
+++ Twitter/auto-load.conf 2012-03-19 00:07:21 +0000
@@ -4,13 +4,13 @@
author = Eduardo Mucelli Rezende Oliveira
# A short description of the applet and how to use it.
-description = You can send tweets, direct messages, and see your timeline. It will alert you when there are new directed messages, and new tweets.\nOn the first time, the applet is going to ask your nickname and authorization to connect with Twitter.\nThe applet is going to open your browser with the authorization page\nAs soon as you authorize it, a PIN number will be shown on the page, copy this number\nPaste this number on the next dialog box will be shown.\nThe plugin is going to inform that you are successfully connected.\nTo see the received tweets right-click on the icon -> Twitter -> [New] tweets.\nTo see the received direct messages right-click on the icon -> Twitter -> [New] direct messages. You can reply one of them just by left-clicking on it.\nTo see some user's info right-click on the icon -> Twitter -> Info.
+description = You can send tweets, direct messages, and see your timeline. It will alert you when there are new directed messages, and new tweets.\nOn the first time, the applet is going to ask your nickname and authorization to connect with Twitter.\nThe applet is going to open your browser with the authorization page\nAs soon as you authorize it, a PIN number will be shown on the page, copy this number\nPaste this number on the next dialog box will be shown.\nThe plugin is going to inform that you are successfully connected.\nYou can retweet any of them by left-clicking on it.\nTo see the received direct messages right-click on the icon -> Twitter -> [New] direct messages. You can reply any of them by left-clicking on it.\nTo see some user's info right-click on the icon -> Twitter -> Info.
# Category of the applet : 2 = files, 3 = internet, 4 = Desktop, 5 = accessory, 6 = system, 7 = fun
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.1.4
+version = 0.2
# Whether the applet can be instanciated several times or not.
multi-instance = true
=== modified file 'Twitter/menu.py'
--- Twitter/menu.py 2012-03-14 00:06:29 +0000
+++ Twitter/menu.py 2012-03-19 00:07:21 +0000
@@ -6,31 +6,39 @@
# E-mail: edumucelli@xxxxxxxxx or eduardom@xxxxxxxxxxx
import gtk, os
+from message import DirectMessage, Tweet
class Menu(gtk.Menu):
- def __init__(self, messages, callback):
+ def __init__(self, icon, callback):
gtk.Menu.__init__(self)
-
- for message in messages:
+
+ self.messages = []
+ self.icon = icon
+ self.callback = callback
+
+ def add(self, message):
+ self.messages.append(message)
+
+ def pop_up(self):
+ for message in self.messages:
text = "<b>%s</b>\n%s" % (message.sender, message.text)
item = gtk.ImageMenuItem()
# the true label is set after with set_markup()
- item.set_label(message.sender)
+ if isinstance(message, DirectMessage):
+ item.set_label(message.sender) # used to track who sent the message in order to reply it.
+ elif isinstance(message, Tweet):
+ item.set_label(message.uid) # used to retweet the tweet
item.set_image(gtk.image_new_from_file(os.path.abspath("./data/received_menu.png")))
item.get_children()[0].set_markup(text)
- item.connect('activate', callback)
+ item.connect('activate', self.callback)
self.append(item)
- item.show()
# add a separator if mail is not last in list
- if messages.index(message) != len(messages) - 1:
+ if self.messages.index(message) != len(self.messages) - 1:
separator = gtk.SeparatorMenuItem()
self.append(separator)
self.show_all()
-
- def pop_up(self, icon):
- self.icon = icon
self.popup(parent_menu_shell=None, parent_menu_item=None, func=self.get_xy, data=(400, 400), button=1, activate_time=0)
def get_xy(self, m, data):
=== added file 'Twitter/message.py'
--- Twitter/message.py 1970-01-01 00:00:00 +0000
+++ Twitter/message.py 2012-03-19 00:07:21 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+# This is a part of the external Twitter applet for Cairo-Dock
+#
+# Author: Eduardo Mucelli Rezende Oliveira
+# E-mail: edumucelli@xxxxxxxxx or eduardom@xxxxxxxxxxx
+
+# Can be either a Tweet or a Direct Message
+class Message:
+ def __init__(self, text, sender):
+ self.text = text
+ self.sender = sender
+
+class DirectMessage(Message):
+ def __init__(self, text, sender):
+ Message.__init__(self, text, sender)
+
+class Tweet(Message):
+ def __init__(self, text, sender, uid):
+ Message.__init__(self, text, sender)
+ self.uid = uid # it is going to be used to retweet this Tweet
Follow ups
