1.7.2 - r351 - Attempt to avoid using JSON::XS, see if that fixes the lost terminal

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

diff --git a/twirssi.pl b/twirssi.pl
index 41821e99020fafb6c92f59d008ce80bf39b93cce..5c68213e943a51f237f13901d2a6bb34ee961300 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -1,7 +1,6 @@
 use strict;
 use Irssi;
 use Irssi::Irc;
 use strict;
 use Irssi;
 use Irssi::Irc;

-use Net::Twitter;

 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;
 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;


@@ -9,10 +8,18 @@ use LWP::Simple;
 use Data::Dumper;
 $Data::Dumper::Indent = 1;
 
 use Data::Dumper;
 $Data::Dumper::Indent = 1;
 

+BEGIN {
+    $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW";
+    require JSON::Any;
+    import JSON::Any;
+    require Net::Twitter;
+    import Net::Twitter;
+}
+

 use vars qw($VERSION %IRSSI);
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "1.7";
-my ($REV) = '$Rev: 343 $' =~ /(\d+)/;
+$VERSION = "1.7.2";
+my ($REV) = '$Rev: 351 $' =~ /(\d+)/;

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


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

-    changed => '$Date: 2009-01-05 16:36:08 -0800 (Mon, 05 Jan 2009) $',
+    changed => '$Date: 2009-01-06 19:33:41 -0800 (Tue, 06 Jan 2009) $',

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


@@ -171,7 +178,7 @@ sub cmd_tweet_as {
             $away = 1;
         } else {
             &notice( "Can't find bitlbee server.",
             $away = 1;
         } else {
             &notice( "Can't find bitlbee server.",

-                "Update bitlbee_server or disalbe tweet_to_away" );
+                "Update bitlbee_server or disable tweet_to_away" );

         }
     }
 
         }
     }
 


@@ -233,7 +240,7 @@ sub cmd_reply_as {
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
     ( $nick, $id ) = split /:/, $id;
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
     ( $nick, $id ) = split /:/, $id;

-    unless ( exists $id_map{$nick} ) {
+    unless ( exists $id_map{ lc $nick } ) {

         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }
         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }


@@ -553,7 +560,8 @@ sub load_friends {
     eval {
         while (1)
         {
     eval {
         while (1)
         {

-            print $fh "Loading friends page $page...\n" if ( $fh and &debug );
+            print $fh "type:debug Loading friends page $page...\n"
+              if ( $fh and &debug );

             my $friends = $twit->friends( { page => $page } );
             last unless $friends;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;
             my $friends = $twit->friends( { page => $page } );
             last unless $friends;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;


@@ -563,19 +571,20 @@ sub load_friends {
     };
 
     if ($@) {
     };
 
     if ($@) {

-        &notice("Error during friends list update.  Aborted.");
+        print $fh "type:error Error during friends list update.  Aborted.\n";

         return;
     }
 
     my ( $added, $removed ) = ( 0, 0 );
         return;
     }
 
     my ( $added, $removed ) = ( 0, 0 );

-    print $fh "Scanning for new friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for new friends...\n" if ( $fh and &debug );

     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
         $added++;
     }
 
     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
         $added++;
     }
 

-    print $fh "Scanning for removed friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for removed friends...\n"
+      if ( $fh and &debug );

     foreach ( keys %friends ) {
         next if exists $new_friends{$_};
         delete $friends{$_};
     foreach ( keys %friends ) {
         next if exists $new_friends{$_};
         delete $friends{$_};


@@ -614,15 +623,16 @@ sub get_updates {
 
         my $new_poll = time;
 
 
         my $new_poll = time;
 

-        &do_updates( $fh, $user, $twit );
+        my $error = 0;
+        $error += &do_updates( $fh, $user, $twit );

         foreach ( keys %twits ) {
             next if $_ eq $user;
         foreach ( keys %twits ) {
             next if $_ eq $user;

-            &do_updates( $fh, $_, $twits{$_} );
+            $error += &do_updates( $fh, $_, $twits{$_} );

         }
 
         my ( $added, $removed ) = &load_friends($fh);
         if ( $added + $removed ) {
         }
 
         my ( $added, $removed ) = &load_friends($fh);
         if ( $added + $removed ) {

-            print $fh "%R***%n Friends list updated: ",
+            print $fh "type:debug %R***%n Friends list updated: ",

               join( ", ",
                 sprintf( "%d added",   $added ),
                 sprintf( "%d removed", $removed ) ),
               join( ", ",
                 sprintf( "%d added",   $added ),
                 sprintf( "%d removed", $removed ) ),


@@ -632,7 +642,13 @@ sub get_updates {
         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }
         foreach ( sort keys %friends ) {
             print $fh "$_ $friends{$_}\n";
         }

-        print $fh $new_poll;
+
+        if ($error) {
+            print $fh "type:error Update encountered errors.  Aborted\n";
+            print $fh $last_poll;
+        } else {
+            print $fh $new_poll;
+        }

         close $fh;
         exit;
     }
         close $fh;
         exit;
     }


@@ -646,13 +662,23 @@ sub do_updates {
     my $tweets;
     eval {
         $tweets = $obj->friends_timeline(
     my $tweets;
     eval {
         $tweets = $obj->friends_timeline(

-            { since => HTTP::Date::time2str($last_poll) } )
-          || [];
+            { since => HTTP::Date::time2str($last_poll) } );

     };
 
     if ($@) {
         print $fh "type:error Error during friends_timeline call.  Aborted.\n";
     };
 
     if ($@) {
         print $fh "type:error Error during friends_timeline call.  Aborted.\n";

-        return;
+        return 1;
+    }
+
+    unless ( ref $tweets ) {
+        if ( $obj->can("get_error") ) {
+            print $fh "type:error API Error during friends_timeline call: ",
+              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+        } else {
+            print $fh
+              "type:error API Error during friends_timeline call. Aborted.\n";
+        }
+        return 1;

     }
 
     foreach my $t ( reverse @$tweets ) {
     }
 
     foreach my $t ( reverse @$tweets ) {


@@ -695,7 +721,7 @@ sub do_updates {
 
     if ($@) {
         print $fh "type:error Error during replies call.  Aborted.\n";
 
     if ($@) {
         print $fh "type:error Error during replies call.  Aborted.\n";

-        return;
+        return 1;

     }
 
     foreach my $t ( reverse @$tweets ) {
     }
 
     foreach my $t ( reverse @$tweets ) {


@@ -718,7 +744,7 @@ sub do_updates {
 
     if ($@) {
         print $fh "type:error Error during direct_messages call.  Aborted.\n";
 
     if ($@) {
         print $fh "type:error Error during direct_messages call.  Aborted.\n";

-        return;
+        return 1;

     }
 
     foreach my $t ( reverse @$tweets ) {
     }
 
     foreach my $t ( reverse @$tweets ) {


@@ -729,14 +755,18 @@ sub do_updates {
           $t->{id}, $username, $t->{sender_screen_name}, $text;
     }
     print scalar localtime, " - Done" if &debug;
           $t->{id}, $username, $t->{sender_screen_name}, $text;
     }
     print scalar localtime, " - Done" if &debug;

+
+    return 0;

 }
 
 sub monitor_child {
 }
 
 sub monitor_child {

-    my ( $data, $attempt ) = @_;
+    my ($data)   = @_;

     my $filename = $data->[0];
     my $filename = $data->[0];

+    my $attempt  = $data->[1];

 
 

-    print scalar localtime, " - checking child log at $filename" if &debug;
-    my $old_last_poll = $last_poll;
+    print scalar localtime, " - checking child log at $filename ($attempt)"
+      if &debug;
+    my $new_last_poll;

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


@@ -744,11 +774,12 @@ sub monitor_child {
             last if /^__friends__/;
             my %meta;
             foreach my $key (qw/id account nick type/) {
             last if /^__friends__/;
             my %meta;
             foreach my $key (qw/id account nick type/) {

-                s/^$key:(\S+)\s*//;
-                $meta{$key} = $1;
+                if (s/^$key:(\S+)\s*//) {
+                    $meta{$key} = $1;
+                }

             }
 
             }
 

-            next if exists $tweet_cache{ $meta{id} };
+            next if exists $meta{id} and exists $tweet_cache{ $meta{id} };

             $tweet_cache{ $meta{id} } = time;
             my $account = "";
             if ( $meta{account} ne $user ) {
             $tweet_cache{ $meta{id} } = time;
             my $account = "";
             if ( $meta{account} ne $user ) {


@@ -774,24 +805,26 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
             } elsif ( $meta{type} eq 'error' ) {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
             } elsif ( $meta{type} eq 'error' ) {

-                push @lines, "debug: $_\n" if &debug,;
+                push @lines, "ERROR: $_\n";

             } elsif ( $meta{type} eq 'debug' ) {
             } elsif ( $meta{type} eq 'debug' ) {

-                push @lines, "debug: $_\n" if &debug,;
+                print "$_" if &debug,;
+            } else {
+                print "Unknown line type $meta{type}: $_" if &debug,;

             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {
             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {

-                $last_poll = $_;
+                $new_last_poll = $_;

                 last;
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 
                 last;
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 

-        if ( $last_poll != $old_last_poll ) {
-            print "new last_poll = $last_poll" if &debug;
+        if ($new_last_poll) {
+            print "new last_poll = $new_last_poll" if &debug;

             foreach my $line (@lines) {
                 chomp $line;
                 $window->print( $line, MSGLEVEL_PUBLIC );
             foreach my $line (@lines) {
                 chomp $line;
                 $window->print( $line, MSGLEVEL_PUBLIC );


@@ -807,9 +840,10 @@ sub monitor_child {
 
             # 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{$_} >= $old_last_poll;
+                next if $tweet_cache{$_} >= $last_poll;

                 delete $tweet_cache{$_};
             }
                 delete $tweet_cache{$_};
             }

+            $last_poll = $new_last_poll;

 
             # save id_map hash
             if ( keys %id_map
 
             # save id_map hash
             if ( keys %id_map


@@ -916,9 +950,11 @@ if ($window) {
     Irssi::command_bind(
         "twirssi_version",
         sub {
     Irssi::command_bind(
         "twirssi_version",
         sub {

-            &notice(
-"Twirssi v$VERSION (r$REV);  Net::Twitter v$Net::Twitter::VERSION. "
-                  . "See details at http://tinyurl.com/twirssi" );
+            &notice("Twirssi v$VERSION (r$REV); "
+                  . "Net::Twitter v$Net::Twitter::VERSION. "
+                  . "JSON in use: "
+                  . JSON::Any::handler()
+                  . ".  See details at http://twirssi.com/" );

         }
     );
     Irssi::command_bind(
         }
     );
     Irssi::command_bind(