Merge lp:~bigwhale/gwibber/direct-messages into lp:gwibber

[David Klasinc]

- sent DM's displayed in the Private stream
- Image of sender and receiver on private messages
- Removed the DM menu option from the context menu if clicking on your own posts
- Sent DM's are fetched from twitter together with received ones by a separate TwitterAPI call

[lp:~bigwhale/gwibber/direct-messages]

686. By David Klasinc on 2010-10-07

Synced with the latest trunk.

Unmerged revisions

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2010-10-05 13:53:57 +0000
+++ gwibber/client.py	2010-10-07 17:41:04 +0000
@@ -450,6 +450,9 @@
     def perform_action(mi, act, widget, msg): act(widget, self, msg)
 
     for a in actions.MENU_ITEMS:
+      if a.action.__self__.__name__ == "private" and msg["sender"]["is_me"]:
+        continue
+
       if a.include(self, msg):
         image = gtk.image_new_from_icon_name(a.icon, gtk.ICON_SIZE_MENU)
         mi = gtk.ImageMenuItem()

=== modified file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py	2010-08-25 20:41:55 +0000
+++ gwibber/microblog/identica.py	2010-10-07 17:41:04 +0000
@@ -174,7 +174,9 @@
     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)
+    private = self._get("direct_messages.json", "private", count=count, since_id=since)
+    private_sent = self._get("direct_messages/sent.json", "private", count=count, since_id=since)
+    return private + private_sent
 
   def public(self):
     return self._get("statuses/public_timeline.json")

=== modified file 'gwibber/microblog/twitter.py'
--- gwibber/microblog/twitter.py	2010-08-30 19:38:08 +0000
+++ gwibber/microblog/twitter.py	2010-10-07 17:41:04 +0000
@@ -232,7 +232,9 @@
     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)
+    private = self._get("direct_messages.json", "private", count=count, since_id=since)
+    private_sent = self._get("direct_messages/sent.json", "private", count=count, since_id=since)
+    return private + private_sent
 
   def public(self):
     return self._get("statuses/public_timeline.json")

=== modified file 'ui/templates/base.mako'
--- ui/templates/base.mako	2010-08-12 15:01:26 +0000
+++ ui/templates/base.mako	2010-10-07 17:41:04 +0000
@@ -56,11 +56,33 @@
 </%def>
 
 <%def name="image(data)">
-  % if "sender" in data:
-    % if "image" in data["sender"]:
-      <a href="${profile_url(data)}">
-        <div class="imgbox" title="${data["sender"].get("nick", "")}" style="background-image: url(${data["sender"]["image"]});"></div>
+  % if data.get("private", 0):
+    % if "recipient" in data:
+      % if data['recipient'].get("is_me", 0):
+        % if "sender" in data:
+          % if "image" in data["sender"]:
+            <a href="${profile_url(data)}">
+              <div class="imgbox" title="${data["sender"].get("nick", "")}" style="background-image: url(${data["sender"]["image"]});">
+              <div class="imgbox" title="${data["recipient"].get("nick", "")}" style="margin: 25px 0px 0px 25px; width: 25px; height: 25px; background-image: url(${data["recipient"]["image"]});"></div></div>
+            </a>
+          % endif
+        % endif
+      % else:
+        % if "image" in data["recipient"]:
+            <a href="${profile_url(data)}">
+              <div class="imgbox" title="${data["sender"].get("nick", "")}" style="background-image: url(${data["sender"]["image"]});">
+              <div class="imgbox" title="${data["recipient"].get("nick", "")}" style="margin: 25px 0px 0px 25px; width: 25px; height: 25px; background-image: url(${data["recipient"]["image"]});"></div></div>
+            </a>
+        % endif
+      % endif
+    % endif
+  % else:
+    % if "sender" in data:
+      % if "image" in data["sender"]:
+        <a href="${profile_url(data)}">
+          <div class="imgbox" title="${data["sender"].get("nick", "")}" style="background-image: url(${data["sender"]["image"]});"></div>
       </a>
+      % endif
     % endif
   % endif
 </%def>
@@ -125,9 +147,33 @@
 <%def name="sender(data)" filter="trim">
   % if "sender" in data:
     % if preferences["show_fullname"]:
-      ${data['sender'].get("name", 0) or data["sender"].get("nick", "")}
+      % if data.get("private", 0):
+        % if "recipient" in data:
+          % if data['recipient'].get("is_me", 0):
+            ${data['sender'].get("name", 0) or data["sender"].get("nick", "")}
+          % else:
+           ${data['recipient'].get("name", 0) or data["recipient"].get("nick", "")}
+          % endif
+        % else:
+          ${data['sender'].get("name", 0) or data["sender"].get("nick", "")}
+        % endif
+      % else:
+        ${data['sender'].get("name", 0) or data["sender"].get("nick", "")}
+      % endif
     % else:
-      ${data['sender'].get("nick", 0) or data["sender"].get("name", "")}
+      % if data.get("private", 0):
+        % if "recipient" in data:
+          % if data['recipient'].get("is_me", 0):
+            ${data['sender'].get("nick", 0) or data["sender"].get("name", "")}
+          % else:
+            ${data['recipient'].get("nick", 0) or data["recipient"].get("name", "")}
+          % endif
+        % else:
+          ${data['sender'].get("nick", 0) or data["sender"].get("name", "")}
+        % endif
+      % else:
+        ${data['sender'].get("nick", 0) or data["sender"].get("name", "")}
+      % endif
     % endif
   % endif
 </%def>
@@ -144,7 +190,15 @@
   % endif
 
   % if data.get("private", 0):
-    <img src="${resources.get_ui_asset('icons/streams/16x16/private.png')}" />
+    % if "recipient" in data:
+      % if data['recipient'].get("is_me", 0):
+        <img src="${resources.get_ui_asset('icons/streams/16x16/private.png')}" />
+      % else:
+        <img src="${resources.get_ui_asset('icons/streams/16x16/sent.png')}" />
+      % endif
+    % else:
+      <img src="${resources.get_ui_asset('icons/streams/16x16/private.png')}" />
+    % endif
   % endif
   </span>
 </%def>