X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/62cf981acdfe8406aec3e17d7ef4e56dea5cd15d..80e4d669710c85419d93922eab15a556b6ab0c36:/twirssi.pl?ds=inline

diff --git a/twirssi.pl b/twirssi.pl
index b049e6f..b7e1767 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -1,7 +1,6 @@
 use strict;
 use Irssi;
 use Irssi::Irc;
-use Net::Twitter;
 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;
@@ -9,10 +8,18 @@ use LWP::Simple;
 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);
 
-$VERSION = "1.7";
-my ($REV) = '$Rev: 344 $' =~ /(\d+)/;
+$VERSION = "1.7.3";
+my ($REV) = '$Rev: 352 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +28,7 @@ my ($REV) = '$Rev: 344 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => '$Date: 2009-01-05 16:40:46 -0800 (Mon, 05 Jan 2009) $',
+    changed => '$Date: 2009-01-08 13:46:50 -0800 (Thu, 08 Jan 2009) $',
 );
 
 my $window;
@@ -171,7 +178,7 @@ sub cmd_tweet_as {
             $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;
-    unless ( exists $id_map{$nick} ) {
+    unless ( exists $id_map{ lc $nick } ) {
         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }
@@ -553,7 +560,8 @@ sub load_friends {
     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;
@@ -563,19 +571,20 @@ sub load_friends {
     };
 
     if ($@) {
-        &notice("Error during friends list update.  Aborted.");
+        print $fh "type:debug Error during friends list update.  Aborted.\n";
         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++;
     }
 
-    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{$_};
@@ -623,7 +632,7 @@ sub get_updates {
 
         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 ) ),
@@ -635,7 +644,7 @@ sub get_updates {
         }
 
         if ($error) {
-            print $fh "type:error Update encountered errors.  Aborted\n";
+            print $fh "type:debug Update encountered errors.  Aborted\n";
             print $fh $last_poll;
         } else {
             print $fh $new_poll;
@@ -653,12 +662,22 @@ sub do_updates {
     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";
+        print $fh "type:debug Error during friends_timeline call.  Aborted.\n";
+        return 1;
+    }
+
+    unless ( ref $tweets ) {
+        if ( $obj->can("get_error") ) {
+            print $fh "type:debug API Error during friends_timeline call: ",
+              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+        } else {
+            print $fh
+              "type:debug API Error during friends_timeline call. Aborted.\n";
+        }
         return 1;
     }
 
@@ -673,7 +692,11 @@ sub do_updates {
             and not exists $friends{ $t->{in_reply_to_screen_name} } )
         {
             $nicks{ $t->{in_reply_to_screen_name} } = time;
-            my $context = $obj->show_status( $t->{in_reply_to_status_id} );
+            my $context;
+            eval {
+              $context = $obj->show_status( $t->{in_reply_to_status_id} );
+            };
+
             if ($context) {
                 my $ctext = decode_entities( $context->{text} );
                 $ctext =~ s/%/%%/g;
@@ -682,8 +705,10 @@ sub do_updates {
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 $reply = "reply";
+            } elsif ($@) {
+                print $fh "type:debug request to get context failed: $@";
             } else {
-                print "Failed to get context from $t->{in_reply_to_screen_name}"
+                print $fh "type:debug Failed to get context from $t->{in_reply_to_screen_name}"
                   if &debug;
             }
         }
@@ -701,7 +726,7 @@ sub do_updates {
     };
 
     if ($@) {
-        print $fh "type:error Error during replies call.  Aborted.\n";
+        print $fh "type:debug Error during replies call.  Aborted.\n";
         return 1;
     }
 
@@ -724,7 +749,7 @@ sub do_updates {
     };
 
     if ($@) {
-        print $fh "type:error Error during direct_messages call.  Aborted.\n";
+        print $fh "type:debug Error during direct_messages call.  Aborted.\n";
         return 1;
     }
 
@@ -741,11 +766,13 @@ sub do_updates {
 }
 
 sub monitor_child {
-    my ( $data, $attempt ) = @_;
+    my ($data)   = @_;
     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>) {
@@ -753,11 +780,12 @@ sub monitor_child {
             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 ) {
@@ -783,24 +811,26 @@ sub monitor_child {
             } 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' ) {
-                push @lines, "debug: $_\n" if &debug,;
+                print "$_" if &debug,;
+            } else {
+                print "Unknown line type $meta{type}: $_" if &debug,;
             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {
-                $last_poll = $_;
+                $new_last_poll = $_;
                 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 );
@@ -816,9 +846,10 @@ sub monitor_child {
 
             # 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{$_};
             }
+            $last_poll = $new_last_poll;
 
             # save id_map hash
             if ( keys %id_map
@@ -925,9 +956,11 @@ if ($window) {
     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(