Changeset 5d59c1e for perl/modules/Twitter/lib

Timestamp:

May 29, 2010, 1:42:02 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

2f25537

Parents:

d27ecf3

git-author:

Nelson Elhage <nelhage@mit.edu> (05/26/10 22:46:35)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/29/10 13:42:02)

Message:

Twitter: Handle new-style retweets better

Location:

perl/modules/Twitter/lib/BarnOwl

Files:

• Message/Twitter.pm (modified) (1 diff)
• Module/Twitter/Handle.pm (modified) (1 diff)

perl/modules/Twitter/lib/BarnOwl/Message/Twitter.pm

@@ -17 +17 @@
 sub service { return (shift->{"service"} || "http://twitter.com"); }
 sub account { return shift->{"account"}; }
+sub retweeted_by { shift->{retweeted_by}; }
 sub long_sender {
     my $self = shift;
     $self->service =~ m#^\s*(.*?://.*?)/.*$#;
     my $service = $1 || $self->service;
-    return $service . '/' . $self->sender
+    my $long = $service . '/' . $self->sender;
+    if ($self->retweeted_by) {
+        $long = "(retweeted by " . $self->retweeted_by . ") $long";
+    }
+    return $long;
 }
 

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -248 +248 @@
                 next;
             }
+            my $orig = $tweet->{retweeted_status};
+            $orig = $tweet unless defined($orig);
+
             my $msg = BarnOwl::Message->new(
                 type      => 'Twitter',
-                sender    => $tweet->{user}{screen_name},
+                sender    => $orig->{user}{screen_name},
                 recipient => $self->{cfg}->{user} || $self->{user},
                 direction => 'in',
-                source    => decode_entities($tweet->{source}),
-                location  => decode_entities($tweet->{user}{location}||""),
-                body      => decode_entities($tweet->{text}),
+                source    => decode_entities($orig->{source}),
+                location  => decode_entities($orig->{user}{location}||""),
+                body      => decode_entities($orig->{text}),
                 status_id => $tweet->{id},
                 service   => $self->{cfg}->{service},
                 account   => $self->{cfg}->{account_nickname},
+                $tweet->{retweeted_status} ? (retweeted_by => $tweet->{user}{screen_name}) : ()
                );
             BarnOwl::queue_message($msg);