1.7.1 - r345 - Fix typos, bug in /reply case insensitivity. v1.7.1

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

diff --git a/twirssi.pl b/twirssi.pl
index 4a6b5dd726cb62a72bbbf86a33d338da1dfde78e..6e6b8a500257507bd6358d55ac26c021f24f4f87 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "1.6.1";
-my ($REV) = '$Rev: 337 $' =~ /(\d+)/;
+$VERSION = "1.7.1";
+my ($REV) = '$Rev: 345 $' =~ /(\d+)/;

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


@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 337 $' =~ /(\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 => 'Mon Dec  1 15:36:01 PST 2008',
+    changed => '$Date: 2009-01-06 07:14:03 -0800 (Tue, 06 Jan 2009) $',

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


@@ -171,7 +171,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 +233,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;
     }


@@ -605,7 +605,7 @@ sub get_updates {
     my $pid = fork();
 
     if ($pid) {    # parent
     my $pid = fork();
 
     if ($pid) {    # parent

-        Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+        Irssi::timeout_add_once( 5000, 'monitor_child', [ $filename, 0 ] );

         Irssi::pidwait_add($pid);
     } elsif ( defined $pid ) {    # child
         close STDIN;
         Irssi::pidwait_add($pid);
     } elsif ( defined $pid ) {    # child
         close STDIN;


@@ -614,10 +614,11 @@ 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);
         }
 
         my ( $added, $removed ) = &load_friends($fh);


@@ -632,7 +633,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;
     }


@@ -652,7 +659,7 @@ sub do_updates {
 
     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;

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


@@ -695,7 +702,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 ) {


@@ -710,9 +717,17 @@ sub do_updates {
     }
 
     print scalar localtime, " - Polling for DMs" if &debug;
     }
 
     print scalar localtime, " - Polling for DMs" if &debug;

-    $tweets =
-      $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
-      || [];
+    eval {
+        $tweets =
+          $obj->direct_messages( { since => HTTP::Date::time2str($last_poll) } )
+          || [];
+    };
+
+    if ($@) {
+        print $fh "type:error Error during direct_messages call.  Aborted.\n";
+        return 1;
+    }
+

     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;


@@ -721,10 +736,12 @@ 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     = shift;
+    my ( $data, $attempt ) = @_;

     my $filename = $data->[0];
 
     print scalar localtime, " - checking child log at $filename" if &debug;
     my $filename = $data->[0];
 
     print scalar localtime, " - checking child log at $filename" if &debug;


@@ -764,9 +781,9 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'reply' ) {
                 push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
             } elsif ( $meta{type} eq 'dm' ) {
             } elsif ( $meta{type} eq 'reply' ) {
                 push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
             } elsif ( $meta{type} eq 'dm' ) {

-                push @lines, "[$account%B\@$meta{nick}%n (%%WDM%%n)] $_\n",;
+                push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;

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

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

             } elsif ( $meta{type} eq 'debug' ) {
                 push @lines, "debug: $_\n" if &debug,;
             }
             } elsif ( $meta{type} eq 'debug' ) {
                 push @lines, "debug: $_\n" if &debug,;
             }


@@ -797,17 +814,37 @@ sub monitor_child {
               or warn "Failed to remove $filename: $!"
               unless &debug;
 
               or warn "Failed to remove $filename: $!"
               unless &debug;
 

-      # keep 10 minutes of cached tweets, to make sure we don't show duplicates.
+            # keep enough cached tweets, to make sure we don't show duplicates.

             foreach ( keys %tweet_cache ) {
             foreach ( keys %tweet_cache ) {

-                next if $tweet_cache{$_} > time - 600;
+                next if $tweet_cache{$_} >= $old_last_poll;

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

+
+            # save id_map hash
+            if ( keys %id_map
+                and my $file =
+                Irssi::settings_get_str("twirssi_replies_store") )
+            {
+                if ( open JSON, ">$file" ) {
+                    print JSON JSON::Any->objToJson( \%id_map );
+                    close JSON;
+                } else {
+                    &notice("Failed to write replies to $file: $!");
+                }
+            }

             return;
         }
     }
 
     close FILE;
             return;
         }
     }
 
     close FILE;

-    Irssi::timeout_add_once( 5000, 'monitor_child', [$filename] );
+
+    if ( $attempt < 12 ) {
+        Irssi::timeout_add_once( 5000, 'monitor_child',
+            [ $filename, $attempt + 1 ] );
+    } else {
+        &notice("Giving up on polling $filename");
+        unlink $filename unless &debug;
+    }

 }
 
 sub debug {
 }
 
 sub debug {


@@ -848,6 +885,8 @@ Irssi::settings_add_str( "twirssi", "twirssi_location",
     ".irssi/scripts/twirssi.pl" );
 Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
 Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
     ".irssi/scripts/twirssi.pl" );
 Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
 Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );

+Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
+    ".irssi/scripts/twirssi.json" );

 Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
 Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );
 Irssi::settings_add_bool( "twirssi", "show_own_tweets",           1 );
 Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
 Irssi::settings_add_bool( "twirssi", "show_reply_context",        0 );
 Irssi::settings_add_bool( "twirssi", "show_own_tweets",           1 );


@@ -873,11 +912,13 @@ if ($window) {
         Irssi::command_bind( "reply_as", "cmd_reply_as" );
     }
     Irssi::command_bind(
         Irssi::command_bind( "reply_as", "cmd_reply_as" );
     }
     Irssi::command_bind(

-        "twitter_dump",
+        "twirssi_dump",

         sub {
         sub {

-            print "twits: ",   Dumper \%twits;
+            print "twits: ", join ", ",
+              map { "u: $_->{username}" } values %twits;

             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;
             print "friends: ", join ", ", sort keys %friends;
             print "nicks: ",   join ", ", sort keys %nicks;

+            print "id_map: ", Dumper \%{ $id_map{__indexes} };

             print "last poll: $last_poll";
         }
     );
             print "last poll: $last_poll";
         }
     );


@@ -913,6 +954,24 @@ if ($window) {
     &notice(
         "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
 
     &notice(
         "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
 

+    my $file = Irssi::settings_get_str("twirssi_replies_store");
+    if ( $file and -r $file ) {
+        if ( open( JSON, $file ) ) {
+            local $/;
+            my $json = <JSON>;
+            close JSON;
+            eval {
+                my $ref = JSON::Any->jsonToObj($json);
+                %id_map = %$ref;
+                my $num = keys %{ $id_map{__indexes} };
+                &notice( sprintf "Loaded old replies from %d contact%s.",
+                    $num, ( $num == 1 ? "" : "s" ) );
+            };
+        } else {
+            &notice("Failed to load old replies from $file: $!");
+        }
+    }
+

     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
         eval "use WWW::Shorten::$provider;";
 
     if ( my $provider = Irssi::settings_get_str("short_url_provider") ) {
         eval "use WWW::Shorten::$provider;";