Merge lp:~matthew-j-singleton/gwibber/new-retweets into lp:gwibber

[Greg Grossmeier]

Support for native retweets.

[Ken VanDine (ken-vandine)]

Thanks for the branch, I manually merged some of your logic into the backend. Your branch was full of conflicts and gwibber has changed quite a bit. Trunk now has native retweet support as well as displaying of retweets natively, Thanks!

review: Disapprove

Unmerged revisions

706. By Matt Singleton on 2010-04-06

fix a dumb bug that breaks services that do not have retweets

705. By Matt Singleton on 2010-04-06

preliminary identica retweet support (naive port from twitter)

704. By Matt Singleton <msingleton@msingleton-wks> on 2010-04-06

merged from upstream

703. By Matt Singleton <msingleton@jayne> on 2010-04-01

display retweeter info in timeline

702. By Matt Singleton <msingleton@jayne> on 2010-04-01

refactor to cut down on some duplication around retweets in the twitter api

701. By Matt Singleton <msingleton@jayne> on 2010-04-01

merging from upstream

700. By Matt Singleton <msingleton@jayne> on 2010-04-01

adding vim modeline.

699. By Matt Singleton <msingleton@jayne> on 2010-03-31

merging from upstream

698. By Matt Singleton <msingleton@jayne> on 2010-03-31

inital support for retweets in home timeline. needs a quick refactor to stomp out some duplication.

=== added file 'gwibber/microblog/identica.py.OTHER'
--- gwibber/microblog/identica.py.OTHER	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/identica.py.OTHER	2011-06-18 11:06:46 +0000
@@ -0,0 +1,211 @@
+# vim: set ts=2 sts=2 sw=2 expandtab:
+import re, network, util
+from util import log
+from util import exceptions
+from gettext import lgettext as _
+log.logger.name = "Identi.ca"
+
+PROTOCOL_INFO = {
+  "name": "Identi.ca",
+  "version": 1.0,
+  
+  "config": [
+    "private:password",
+    "username",
+    "color",
+    "receive_enabled",
+    "send_enabled",
+  ],
+
+  "authtype": "login",
+  "color": "#4E9A06",
+
+  "features": [
+    "send",
+    "receive",
+    "search",
+    "tag",
+    "reply",
+    "responses",
+    "private",
+    "public",
+    "delete",
+    "retweet",
+    "like",
+    "send_thread",
+    "user_messages",
+    "sinceid",
+  ],
+
+  "default_streams": [
+    "receive",
+    "responses",
+    "private",
+  ],
+}
+
+URL_PREFIX = "https://identi.ca"
+
+# Whether to treat the original sender or the
+# retweeter as the actual sender
+# TODO: make this a user configurable value
+USE_ORIGINAL_SENDER = True
+
+def get_html_field(data):
+  return util.linkify(data["text"],
+    ((util.PARSE_HASH, '#<a class="hash" href="%s#search?q=\\1">\\1</a>' % URL_PREFIX),
+     (util.PARSE_NICK, '@<a class="nick" href="%s/\\1">\\1</a>' % URL_PREFIX)), 
+    escape=False)
+
+def get_content_field(data, account_id):
+  return util.linkify(data["text"],
+    ((util.PARSE_HASH, '#<a class="hash" href="gwibber:/tag?acct=%s&query=\\1">\\1</a>' % account_id),
+     (util.PARSE_NICK, '@<a class="nick" href="gwibber:/user?acct=%s&name=\\1">\\1</a>' % account_id)),
+    escape=False)
+
+def get_user_data(data, account):
+  user = data["user"] if "user" in data else data["sender"]
+  ud = {}
+  ud["name"] = user["name"]
+  ud["nick"] = user["screen_name"]
+  ud["id"] = user["id"]
+  ud["location"] = user["location"]
+  ud["followers"] = user["followers_count"]
+  ud["image"] = user["profile_image_url"]
+  ud["url"] = "/".join((URL_PREFIX, ud["nick"]))
+  ud["is_me"] = ud["nick"] == account["username"]
+  return ud
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def _common(self, data):
+    m = {}
+    m["protocol"] = "identica"
+    m["account"] = self.account["_id"]
+    m["time"] = util.parsetime(data["created_at"])
+    m["source"] = data.get("source", False)
+    m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
+
+    if "retweeted_status" in data and (USE_ORIGINAL_SENDER):
+      m["id"] = str(data["retweeted_status"]["id"])
+      m["text"] = data["retweeted_status"]["text"]
+      m["html"] = get_html_field(data["retweeted_status"])
+      m["content"] = get_content_field(data["retweeted_status"], m["account"])
+    else:
+      m["id"] = str(data["id"])
+      m["text"] = data["text"]
+      m["html"] = get_html_field(data)
+      m["content"] = get_content_field(data, m["account"])
+
+    if data.get("attachments", 0):
+      m["images"] = []
+      for a in data["attachments"]:
+        mime = a.get("mimetype", "")
+        if mime and mime.startswith("image") and a.get("url", 0):
+          m["images"].append({"src": a["url"], "url": a["url"]})
+
+    return m
+
+  def _message(self, data):
+    m = self._common(data)
+    
+    if data.get("in_reply_to_status_id", 0) and data.get("in_reply_to_screen_name", 0):
+      m["reply"] = {}
+      m["reply"]["id"] = data["in_reply_to_status_id"]
+      m["reply"]["nick"] = data["in_reply_to_screen_name"]
+      m["reply"]["url"] = "/".join((URL_PREFIX, "notice", str(m["reply"]["id"])))
+
+    if ("retweeted_status" in data) and (USE_ORIGINAL_SENDER):
+      m["sender"] = get_user_data(data["retweeted_status"], self.account)
+      m["retweeter"] = get_user_data(data, self.account)
+      m["retweet"] = True
+    else:
+      m["sender"] = get_user_data(data, self.account)
+      m["retweet"] = False
+    
+    m["url"] = "/".join((URL_PREFIX, "notice", m["id"]))
+
+    return m
+
+  def _private(self, data):
+    m = self._message(data)
+    m["private"] = True
+    return m
+
+  def _result(self, data):
+    m = self._common(data)
+    
+    if data["to_user_id"]:
+      m["reply"] = {}
+      m["reply"]["id"] = data["to_user_id"]
+      m["reply"]["nick"] = data["to_user"]
+
+    m["sender"] = {}
+    m["sender"]["nick"] = data["from_user"]
+    m["sender"]["id"] = data["from_user_id"]
+    m["sender"]["image"] = data["profile_image_url"]
+    m["sender"]["url"] = "/".join((URL_PREFIX, m["sender"]["nick"]))
+    m["url"] = "/".join((m["sender"]["url"], "statuses", m["id"]))
+    return m
+
+  def _get(self, path, parse="message", post=False, single=False, **args):
+    url = "/".join((URL_PREFIX, "api", path))
+    data = network.Download(url, util.compact(args), post,
+        self.account["username"], self.account["password"]).get_json()
+
+    # error is "Could not authenticate you" for failed auth
+    try:
+      if single: return [getattr(self, "_%s" % parse)(data)]
+      if parse: return [getattr(self, "_%s" % parse)(m) for m in data]
+      else: return []
+    except:
+      if data.has_key("error"):
+        if "authenticate" in data["error"]:
+          raise exceptions.GwibberProtocolError("auth", self.account["protocol"], self.account["username"], data["error"])
+
+  def _search(self, **args):
+    data = network.Download("%s/api/search.json" % URL_PREFIX, util.compact(args))
+    data = data.get_json()["results"]
+    return [self._result(m) for m in data]
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+  
+  def receive(self, count=util.COUNT, since=None):
+    return self._get("statuses/friends_timeline.json", count=count, since_id=since)
+
+  def user_messages(self, id=None, count=util.COUNT, since=None):
+    return self._get("statuses/user_timeline.json", id=id, count=count, since_id=since)
+
+  def responses(self, count=util.COUNT, since=None):
+    return self._get("statuses/mentions.json", count=count, since_id=since)
+
+  def private(self, count=util.COUNT, since=None):
+    return self._get("direct_messages.json", "private", count=count, since_id=since)
+
+  def public(self):
+    return self._get("statuses/public_timeline.json")
+
+  def search(self, query, count=util.COUNT, since=None):
+    return self._search(q=query, rpp=count, since_id=since)
+
+  def tag(self, query, count=util.COUNT, since=None):
+    return self._search(q="#%s" % query, count=count, since_id=since)
+
+  def delete(self, message):
+    self._get("statuses/destroy/%s.json" % message["id"], None, post=True, do=1)
+    return []
+
+  def like(self, message):
+    self._get("favorites/create/%s.json" % message["id"], None, post=True, do=1)
+    return []
+
+  def send(self, message):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="Gwibber")
+
+  def send_thread(self, message, target):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="gwibber", in_reply_to_status_id=target["id"])

=== added file 'gwibber/microblog/twitter.py.OTHER'
--- gwibber/microblog/twitter.py.OTHER	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/twitter.py.OTHER	2011-06-18 11:06:46 +0000
@@ -0,0 +1,210 @@
+# vim: set ts=2 sts=2 sw=2 expandtab:
+import network, util, htmllib
+from util import log
+from util import exceptions
+from gettext import lgettext as _
+log.logger.name = "Twitter"
+
+PROTOCOL_INFO = {
+  "name": "Twitter",
+  "version": "1.0",
+  
+  "config": [
+    "private:password",
+    "username",
+    "color",
+    "receive_enabled",
+    "send_enabled",
+  ],
+ 
+  "authtype": "login",
+  "color": "#729FCF",
+
+  "features": [
+    "send",
+    "receive",
+    "search",
+    "tag",
+    "reply",
+    "responses",
+    "private",
+    "public",
+    "delete",
+    "retweet",
+    "like",
+    "send_thread",
+    "user_messages",
+    "sinceid",
+  ],
+
+  "default_streams": [
+    "receive",
+    "responses",
+    "private",
+  ],
+}
+
+URL_PREFIX = "https://twitter.com"
+
+# Whether to treat the original sender or the
+# retweeter as the actual sender
+# TODO: make this a user configurable value
+USE_ORIGINAL_SENDER = True
+
+def unescape(s):
+  p = htmllib.HTMLParser(None)
+  p.save_bgn()
+  p.feed(s)
+  return p.save_end()
+
+def get_html_field(data):
+  return util.linkify(data["text"],
+    ((util.PARSE_HASH, '#<a class="hash" href="%s#search?q=\\1">\\1</a>' % URL_PREFIX),
+     (util.PARSE_NICK, '@<a class="nick" href="%s/\\1">\\1</a>' % URL_PREFIX)), 
+    escape=False)
+
+def get_content_field(data, account_id):
+  return util.linkify(data["text"],
+    ((util.PARSE_HASH, '#<a class="hash" href="gwibber:/tag?acct=%s&query=\\1">\\1</a>' % account_id),
+     (util.PARSE_NICK, '@<a class="nick" href="gwibber:/user?acct=%s&name=\\1">\\1</a>' % account_id)),
+    escape=False)
+
+def get_user_data(data, account):
+  user = data["user"] if "user" in data else data["sender"]
+  ud = {}
+  ud["name"] = user["name"]
+  ud["nick"] = user["screen_name"]
+  ud["id"] = user["id"]
+  ud["location"] = user["location"]
+  ud["followers"] = user["followers_count"]
+  ud["image"] = user["profile_image_url"]
+  ud["url"] = "/".join((URL_PREFIX, ud["nick"]))
+  ud["is_me"] = ud["nick"] == account["username"]
+  return ud
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def _common(self, data):
+    m = {}
+    m["protocol"] = "twitter"
+    m["account"] = self.account["_id"]
+    m["time"] = util.parsetime(data["created_at"])
+    m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
+
+    if "retweeted_status" in data and (USE_ORIGINAL_SENDER):
+      m["id"] = str(data["retweeted_status"]["id"])
+      m["text"] = unescape(data["retweeted_status"]["text"])
+      m["html"] = get_html_field(data["retweeted_status"])
+      m["content"] = get_content_field(data["retweeted_status"], m["account"])
+    else:
+      m["id"] = str(data["id"])
+      m["text"] = unescape(data["text"])
+      m["html"] = get_html_field(data)
+      m["content"] = get_content_field(data, m["account"])
+
+    return m
+
+  def _message(self, data):
+    m = self._common(data)
+    m["source"] = data.get("source", False)
+    
+    if "in_reply_to_status_id" in data and data["in_reply_to_status_id"]:
+      m["reply"] = {}
+      m["reply"]["id"] = data["in_reply_to_status_id"]
+      m["reply"]["nick"] = data["in_reply_to_screen_name"]
+      m["reply"]["url"] = "/".join((URL_PREFIX, m["reply"]["nick"], "statuses", str(m["reply"]["id"])))
+
+    if ("retweeted_status" in data) and (USE_ORIGINAL_SENDER):
+      m["sender"] = get_user_data(data["retweeted_status"], self.account)
+      m["retweeter"] = get_user_data(data, self.account)
+      m["retweet"] = True
+    else:
+      m["sender"] = get_user_data(data, self.account)
+      m["retweet"] = False
+    
+    m["url"] = "/".join((m["sender"]["url"], "statuses", str(m["id"])))
+
+    return m
+
+  def _private(self, data):
+    m = self._message(data)
+    m["private"] = True
+    return m
+
+  def _result(self, data):
+    m = self._common(data)
+    
+    if data["to_user_id"]:
+      m["reply"] = {}
+      m["reply"]["id"] = data["to_user_id"]
+      m["reply"]["nick"] = data["to_user"]
+
+    m["sender"] = {}
+    m["sender"]["nick"] = data["from_user"]
+    m["sender"]["id"] = data["from_user_id"]
+    m["sender"]["image"] = data["profile_image_url"]
+    m["sender"]["url"] = "/".join((URL_PREFIX, m["sender"]["nick"]))
+    m["sender"]["is_me"] = m["sender"]["nick"] == self.account["username"]
+    m["url"] = "/".join((m["sender"]["url"], "statuses", str(m["id"])))
+    return m
+
+  def _get(self, path, parse="message", post=False, single=False, **args):
+    url = "/".join((URL_PREFIX, path))
+    data = network.Download(url, util.compact(args) or None, post,
+        self.account["username"], self.account["password"]).get_json()
+
+    # error is "Could not authenticate you" for failed auth
+    try:
+      if single: return [getattr(self, "_%s" % parse)(data)]
+      if parse: return [getattr(self, "_%s" % parse)(m) for m in data]
+      else: return []
+    except:
+      if data.has_key("error"):
+        if "authenticate" in data["error"]:
+          raise exceptions.GwibberProtocolError("auth", self.account["protocol"], self.account["username"], data["error"])
+
+  def _search(self, **args):
+    data = network.Download("http://search.twitter.com/search.json", util.compact(args))
+    data = data.get_json()["results"]
+    return [self._result(m) for m in data]
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+  
+  def receive(self, count=util.COUNT, since=None):
+    return self._get("statuses/home_timeline.json", count=count, since_id=since)
+
+  def user_messages(self, id=None, count=util.COUNT, since=None):
+    return self._get("statuses/user_timeline.json", id=id, count=count, since_id=since)
+
+  def responses(self, count=util.COUNT, since=None):
+    return self._get("statuses/mentions.json", count=count, since_id=since)
+
+  def private(self, count=util.COUNT, since=None):
+    return self._get("direct_messages.json", "private", count=count, since_id=since)
+
+  def public(self):
+    return self._get("statuses/public_timeline.json")
+
+  def search(self, query, count=util.COUNT, since=None):
+    return self._search(q=query, rpp=count, since_id=since)
+
+  def tag(self, query, count=util.COUNT, since=None):
+    return self._search(q="#%s" % query, count=count, since_id=since)
+
+  def delete(self, message):
+    return self._get("statuses/destroy/%s.json" % message["id"], None, post=True, do=1)
+
+  def like(self, message):
+    return self._get("favorites/create/%s.json" % message["id"], None, post=True, do=1)
+
+  def send(self, message):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="gwibbernet")
+
+  def send_thread(self, message, target):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="gwibbernet", in_reply_to_status_id=target["id"])
+

=== modified file 'ui/templates/base.mako'
--- ui/templates/base.mako	2011-04-13 18:34:14 +0000
+++ ui/templates/base.mako	2011-06-18 11:06:46 +0000
@@ -4,6 +4,7 @@
   </a>
 </%def>
 
+<<<<<<< TREE
 <%def name="profile_url(data)" filter="trim">
   % if services.has_key(data["service"]):
     % if "user_messages" in services[data["service"]]["features"]:
@@ -11,6 +12,13 @@
     % else:
       ${data['sender']['url']}
     % endif
+=======
+<%def name="profile_url(data, user)" filter="trim">
+  % if "user_messages" in services[data["protocol"]]["features"]:
+    gwibber:/user?acct=${data['account']}&amp;name=${user["nick"]}
+  % else:
+    ${user['url']}
+>>>>>>> MERGE-SOURCE
   % endif
 </%def>
 
@@ -64,6 +72,7 @@
 </%def>
 
 <%def name="image(data)">
+<<<<<<< TREE
   % if data.get("private", 0):
     % if "recipient" in data:
       % if data['recipient'].get("is_me", 0):
@@ -141,6 +150,11 @@
   <div class="thumbnails">
     <a href="${data['photo']['url']}"><img src="${data['photo']['picture']}" /></a>
   </div>
+=======
+  <a href="${profile_url(data, data['sender'])}">
+    <div class="imgbox" title="${data["sender"].get("nick", "")}" style="background-image: url(${data["sender"]["image"]});"></div>
+  </a>
+>>>>>>> MERGE-SOURCE
 </%def>
 
 <%def name="images(data)">
@@ -206,7 +220,16 @@
   % endif
 </%def>
 
+<%def name="username(user)" filter="trim">
+  % if preferences["show_fullname"]:
+    ${user.get("name", 0) or user.get("nick", "")}
+  % else:
+    ${user.get("nick", 0) or user.get("name", "")}
+  % endif
+</%def>
+
 <%def name="sender(data)" filter="trim">
+<<<<<<< TREE
   % if "sender" in data:
     % if preferences["show_fullname"]:
       % if data.get("private", 0):
@@ -238,6 +261,13 @@
       % endif
     % endif
   % endif
+=======
+  ${username(data['sender'])}
+</%def>
+
+<%def name="retweeter(data)" filter="trim">
+  ${username(data['retweeter'])}
+>>>>>>> MERGE-SOURCE
 </%def>
 
 <%def name="title(data)">
@@ -276,6 +306,15 @@
     <span class="text" id="text-${data['id']}">${data.get('content', '')}</span>
   % endif
   </p>
+  % if data.get("retweet") == True:
+    <p class="rt_attribution">
+      <span class="text">Retweeted by: 
+        <a href="${profile_url(data, data['retweeter'])}">
+          ${retweeter(data)}
+        </a>
+      </span>
+    </p>
+  % endif
 </%def>
 
 <%def name="sidebar(data)">