X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;f=Dev%2Ftwitter%2Fdump_timeline.pl;h=48a1412fab8784e67ca0eb9e0d49762e64cf0844;hb=c1b8ad4f4aa627d9318108dba6f0f54c472e8565;hp=1fa8121771253ab32f38e54d053bf31ed2934bcb;hpb=ee655ecc81f3c02cd73b34e19e0f4fbb51b4efdb;p=lab.git

diff --git a/Dev/twitter/dump_timeline.pl b/Dev/twitter/dump_timeline.pl
index 1fa8121..48a1412 100755
--- a/Dev/twitter/dump_timeline.pl
+++ b/Dev/twitter/dump_timeline.pl
@@ -18,7 +18,7 @@ use Encode;
 my $help = sub {
     die <<EOM;
 usage: $0
-    [user_timeline(default)|retweeted_by_me|mentions
+    [{u}ser_timeline(default)|{r}etweeted_by_me|{m}sentions|{s}earch
         [screen_name
             [number_of_pages|all
                 [dump]
@@ -52,24 +52,37 @@ if (! $bot->authorized) {
 
 eval {
     my $page = 0;
-    while ($pages - $page && $page <= 160) {
+    while ($pages - $page && $page <= 20) {
         $page++;
         
         my $param = ($screen_name)
-            ? { page => $page, screen_name => $screen_name, }
-            : { page => $page, }
+            ? { page => $page, screen_name => $screen_name, count => 200, }
+            : { page => $page, count => 200, }
         ;
     
         my $res;
-        if ($method eq 'user_timeline') {
+        if ($method eq 'user_timeline' || $method eq 'u') {
             $res = $bot->user_timeline($param);
         }
-        elsif ($method eq 'retweeted_by_me') {
+        elsif ($method eq 'retweeted_by_me' || $method eq 'r') {
             $res = $bot->retweeted_by_me($param);
         }
-        elsif ($method eq 'mentions') {
+        elsif ($method eq 'mentions' || $method eq 'm') {
             $res = $bot->mentions($param);
         }
+        elsif ($method eq 'search' || $method eq 's') {
+            my $key;
+            foreach my $word (@{ $conf->{hashtag} }) {
+                if ($key) {
+                    $key .= " OR $word";
+                }
+                else {
+                    $key = $word;
+                }
+            }
+            $param->{q} = $key;
+            $res = $bot->search($param)->{results};
+        }
         else {
             warn "$0: unknown method '$method'";
             &{$help};
@@ -85,7 +98,11 @@ eval {
             foreach my $status (@{$res}) {
                 my $text = "";
                 $text .= "(". $status->{id} . ") ";
-                $text .= $status->{user}{name};
+                $text .= ($status->{user}{screen_name}) ?
+                    $status->{user}{screen_name} : $status->{from_user};
+                $text .= "|";
+                $text .= ($status->{user}{name}) ?
+                    $status->{user}{name} : $status->{from_user_name};
                 $text .= " [" . $status->{created_at} . "]";
                 $text .= " ".  $status->{text};
                 $text =~ s/\n//;
@@ -125,6 +142,7 @@ sub login {
     my $bot = Net::Twitter::Lite->new(
         consumer_key    => $conf->{consumer_key},
         consumer_secret => $conf->{consumer_secret},
+        legacy_lists_api => 0,
     );
     
     $bot->access_token($conf->{access_token});