r488 - Don't cahce tweets until we actually display them. Dump now dumps out the...

[twirssi-net-twitter-lite.git] / twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index 093a1b84bcab255efdb862e07dbd1a075503431e..069d8cd8e02375aeacd28206cdfdf5c605d018db 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -6,13 +6,13 @@ use HTML::Entities;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;

-use Net::Identica;
+use Net::Twitter;

 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.0.6";
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.0.6";

-my ($REV) = '$Rev: 483 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 488 $' =~ /(\d+)/;

 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',


@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 483 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',

-    changed => '$Date: 2009-02-20 14:37:28 -0800 (Fri, 20 Feb 2009) $',
+    changed => '$Date: 2009-02-24 13:57:57 -0800 (Tue, 24 Feb 2009) $',

 );
 
 my $window;
 );
 
 my $window;


@@ -34,6 +34,7 @@ my %nicks;
 my %friends;
 my %tweet_cache;
 my %id_map;
 my %friends;
 my %tweet_cache;
 my %id_map;

+my $failwhale            = 0;

 my %irssi_to_mirc_colors = (
     '%k' => '01',
     '%r' => '05',
 my %irssi_to_mirc_colors = (
     '%k' => '01',
     '%r' => '05',


@@ -373,7 +374,7 @@ sub cmd_login {
 
     %friends = %nicks = ();
 
 
     %friends = %nicks = ();
 

-    $twit = Net::Identica->new(
+    $twit = Net::Twitter->new(

         username => $user,
         password => $pass,
         source   => "twirssi"
         username => $user,
         password => $pass,
         source   => "twirssi"


@@ -415,7 +416,7 @@ sub cmd_login {
         }
         %nicks = %friends;
         $nicks{$user} = 0;
         }
         %nicks = %friends;
         $nicks{$user} = 0;

-        &get_updates;
+        return 1;

     } else {
         &notice("Login failed");
     }
     } else {
         &notice("Login failed");
     }


@@ -425,7 +426,7 @@ sub cmd_add_search {
     my ( $data, $server, $win ) = @_;
 
     unless ( $twit and $twit->can('search') ) {
     my ( $data, $server, $win ) = @_;
 
     unless ( $twit and $twit->can('search') ) {

-        &notice("ERROR: Your version of Net::Identica ($Net::Identica::VERSION) "
+        &notice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "

               . "doesn't support searches." );
         return;
     }
               . "doesn't support searches." );
         return;
     }


@@ -451,7 +452,7 @@ sub cmd_del_search {
     my ( $data, $server, $win ) = @_;
 
     unless ( $twit and $twit->can('search') ) {
     my ( $data, $server, $win ) = @_;
 
     unless ( $twit and $twit->can('search') ) {

-        &notice("ERROR: Your version of Net::Identica ($Net::Identica::VERSION) "
+        &notice("ERROR: Your version of Net::Twitter ($Net::Twitter::VERSION) "

               . "doesn't support searches." );
         return;
     }
               . "doesn't support searches." );
         return;
     }


@@ -634,6 +635,7 @@ sub get_updates {
     return unless &logged_in($twit);
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     return unless &logged_in($twit);
 
     my ( $fh, $filename ) = File::Temp::tempfile();

+    binmode( $fh, ":utf8" );

     my $pid = fork();
 
     if ($pid) {    # parent
     my $pid = fork();
 
     if ($pid) {    # parent


@@ -689,10 +691,7 @@ sub do_updates {
 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;
 
     print scalar localtime, " - Polling for updates for $username" if &debug;
     my $tweets;

-    eval {
-        $tweets = $obj->friends_timeline(
-            { since => HTTP::Date::time2str($last_poll) } );
-    };
+    eval { $tweets = $obj->friends_timeline(); };

 
     if ($@) {
         print $fh
 
     if ($@) {
         print $fh


@@ -845,8 +844,15 @@ sub monitor_child {
     print scalar localtime, " - checking child log at $filename ($attempt)"
       if &debug;
     my $new_last_poll;
     print scalar localtime, " - checking child log at $filename ($attempt)"
       if &debug;
     my $new_last_poll;

+
+    # first time we run we don't want to print out *everything*, so we just
+    # pretend
+    my $suppress = 0;
+    $suppress = 1 unless keys %tweet_cache;
+

     if ( open FILE, $filename ) {
         my @lines;
     if ( open FILE, $filename ) {
         my @lines;

+        my %new_cache;

         while (<FILE>) {
             chomp;
             last if /^__friends__/;
         while (<FILE>) {
             chomp;
             last if /^__friends__/;


@@ -859,8 +865,11 @@ sub monitor_child {
             }
 
             if ( not $meta{type} or $meta{type} ne 'searchid' ) {
             }
 
             if ( not $meta{type} or $meta{type} ne 'searchid' ) {

-                next if exists $meta{id} and exists $tweet_cache{ $meta{id} };
-                $tweet_cache{ $meta{id} } = time;
+                $new_cache{ $meta{id} } = time;
+
+                if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
+                    next;
+                }

             }
 
             my $account = "";
             }
 
             my $account = "";


@@ -945,12 +954,16 @@ sub monitor_child {
 
         if ($new_last_poll) {
             print "new last_poll = $new_last_poll" if &debug;
 
         if ($new_last_poll) {
             print "new last_poll = $new_last_poll" if &debug;

-            for my $line (@lines) {
-                $window->printformat(
-                    $line->[0],
-                    "twirssi_" . $line->[1],
-                    @$line[ 2 .. $#$line ]
-                );
+            if ($suppress) {
+                print "First call, not printing updates" if &debug;
+            } else {
+                foreach my $line (@lines) {
+                    $window->printformat(
+                        $line->[0],
+                        "twirssi_" . $line->[1],
+                        @$line[ 2 .. $#$line ]
+                    );
+                }

             }
 
             close FILE;
             }
 
             close FILE;


@@ -958,9 +971,13 @@ sub monitor_child {
               or warn "Failed to remove $filename: $!"
               unless &debug;
 
               or warn "Failed to remove $filename: $!"
               unless &debug;
 

+            # commit the pending cache lines to the actual cache, now that
+            # we've printed our output
+            %tweet_cache = ( %tweet_cache, %new_cache );
+

             # keep enough cached tweets, to make sure we don't show duplicates.
             foreach ( keys %tweet_cache ) {
             # keep enough cached tweets, to make sure we don't show duplicates.
             foreach ( keys %tweet_cache ) {

-                next if $tweet_cache{$_} >= $last_poll;
+                next if $tweet_cache{$_} >= $last_poll - 3600;

                 delete $tweet_cache{$_};
             }
             $last_poll = $new_last_poll;
                 delete $tweet_cache{$_};
             }
             $last_poll = $new_last_poll;


@@ -977,6 +994,7 @@ sub monitor_child {
                     &notice("Failed to write replies to $file: $!");
                 }
             }
                     &notice("Failed to write replies to $file: $!");
                 }
             }

+            $failwhale = 0;

             return;
         }
     }
             return;
         }
     }


@@ -999,6 +1017,23 @@ sub monitor_child {
         } else {
             $since = scalar localtime($last_poll);
         }
         } else {
             $since = scalar localtime($last_poll);
         }

+
+        if ( not $failwhale and time - $last_poll > 60 * 60 ) {
+            foreach my $whale (
+                q{     v  v        v},
+                q{     |  |  v     |  v},
+                q{     | .-, |     |  |},
+                q{  .--./ /  |  _.---.| },
+                q{   '-. (__..-"       \\},
+                q{      \\          a    |},
+                q{       ',.__.   ,__.-'/},
+                q{         '--/_.'----'`}
+              )
+            {
+                &notice($whale);
+            }
+            $failwhale = 1;
+        }

         &notice("Haven't been able to get updated tweets since $since");
     }
 }
         &notice("Haven't been able to get updated tweets since $since");
     }
 }


@@ -1201,13 +1236,18 @@ if ($window) {
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };
             print "last poll: $last_poll";
             print "nicks: ",   join ", ", sort keys %nicks;
             print "searches: ", Dumper \%{ $id_map{__searches} };
             print "last poll: $last_poll";

+            if ( open DUMP, ">/tmp/twirssi.cache.txt" ) {
+                print DUMP Dumper \%tweet_cache;
+                close DUMP;
+                print "cache written out to /tmp/twirssi.cache.txt";
+            }

         }
     );
     Irssi::command_bind(
         "twirssi_version",
         sub {
             &notice("Twirssi v$VERSION (r$REV); "
         }
     );
     Irssi::command_bind(
         "twirssi_version",
         sub {
             &notice("Twirssi v$VERSION (r$REV); "

-                  . "Net::Identica v$Net::Identica::VERSION. "
+                  . "Net::Twitter v$Net::Twitter::VERSION. "

                   . "JSON in use: "
                   . JSON::Any::handler()
                   . ".  See details at http://twirssi.com/" );
                   . "JSON in use: "
                   . JSON::Any::handler()
                   . ".  See details at http://twirssi.com/" );


@@ -1269,6 +1309,7 @@ if ($window) {
         and my $autopass = Irssi::settings_get_str("twitter_passwords") )
     {
         &cmd_login();
         and my $autopass = Irssi::settings_get_str("twitter_passwords") )
     {
         &cmd_login();

+        &get_updates;

     }
 
 } else {
     }
 
 } else {