X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/720e93b3ab39eaf2acbb54ec4fd365732f4ed47f..39adc7493fc523512d18ce3e26f65acc53ae01a2:/twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index 68dfac8..4f1d0ae 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.2.5beta";
-my ($REV) = '$Rev: 676 $' =~ /(\d+)/;
+$VERSION = "2.3.0beta";
+my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 676 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
-    changed => '$Date: 2009-07-22 11:05:52 -0700 (Wed, 22 Jul 2009) $',
+    changed => '$Date: 2009-08-07 01:24:53 -0700 (Fri, 07 Aug 2009) $',
 );
 
 my $window;
@@ -38,6 +38,8 @@ my %tweet_cache;
 my %id_map;
 my $failwhale  = 0;
 my $first_call = 1;
+my $child_pid;
+my %fix_replies_index;
 
 my %irssi_to_mirc_colors = (
     '%k' => '01',
@@ -440,6 +442,10 @@ sub cmd_login {
     my $pass;
     if ($data) {
         ( $user, $pass ) = split ' ', $data, 2;
+        unless ($pass) {
+            &notice("usage: /twitter_login <username>[\@<service>] <password>");
+            return;
+        }
     } elsif ( my $autouser = Irssi::settings_get_str("twitter_usernames")
         and my $autopass = Irssi::settings_get_str("twitter_passwords") )
     {
@@ -495,11 +501,32 @@ sub cmd_login {
     $twit = "Net::$service"->new(
         username => $user,
         password => $pass,
-        source   => "twirssi"
+        source   => "twirssi",
+        ssl      => Irssi::settings_get_bool("twirssi_avoid_ssl") ? 0 : 1,
     );
 
+    unless ($twit) {
+        &notice("Failed to create Net::$service object!  Aborting.");
+        return;
+    }
+
+    if ( my $timeout = Irssi::settings_get_int("twitter_timeout")
+        and $twit->can('ua') )
+    {
+        $twit->ua->timeout($timeout);
+    }
+
     unless ( $twit->verify_credentials() ) {
         &notice("Login as $user\@$service failed");
+
+        if ( not Irssi::settings_get_bool("twirssi_avoid_ssl") ) {
+            &notice(
+                "It's possible you're missing one of the modules required for "
+                  . "SSL logins.  Try setting twirssi_avoid_ssl to on.  See "
+                  . "http://cpansearch.perl.org/src/GAAS/libwww-perl-5.831/README.SSL "
+                  . "for the detailed requirements." );
+        }
+
         $twit = undef;
         if ( keys %twits ) {
             &cmd_switch( ( keys %twits )[0], $server, $win );
@@ -525,12 +552,6 @@ sub cmd_login {
         &notice( "loaded friends: ", scalar keys %friends );
         if ( Irssi::settings_get_bool("twirssi_first_run") ) {
             Irssi::settings_set_bool( "twirssi_first_run", 0 );
-            unless ( exists $friends{twirssi} ) {
-                &notice("Welcome to twirssi!"
-                      . "  Perhaps you should add \@twirssi to your friends list,"
-                      . " so you can be notified when a new version is release?"
-                      . "  Just type /twitter_follow twirssi." );
-            }
         }
         %nicks = %friends;
         $nicks{$user} = 0;
@@ -540,6 +561,68 @@ sub cmd_login {
     }
 }
 
+sub cmd_add_follow {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($data) {
+        &notice("Usage: /twitter_add_follow_extra <username>");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    $data =~ s/^\@//;
+    $data = lc $data;
+
+    if ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+        &notice("Already following all replies by \@$data");
+        return;
+    }
+
+    $id_map{__fixreplies}{"$user\@$defservice"}{$data} = 1;
+    &notice("Will now follow all replies by \@$data");
+}
+
+sub cmd_del_follow {
+    my ( $data, $server, $win ) = @_;
+
+    unless ($data) {
+        &notice("Usage: /twitter_del_follow_extra <username>");
+        return;
+    }
+
+    $data =~ s/^\s+|\s+$//;
+    $data =~ s/^\@//;
+    $data = lc $data;
+
+    unless ( exists $id_map{__fixreplies}{"$user\@$defservice"}{$data} ) {
+        &notice("Wasn't following all replies by \@$data");
+        return;
+    }
+
+    delete $id_map{__fixreplies}{"$user\@$defservice"}{$data};
+    &notice("Will no longer follow all replies by \@$data");
+}
+
+sub cmd_list_follow {
+    my ( $data, $server, $win ) = @_;
+
+    my $found = 0;
+    foreach my $suser ( sort keys %{ $id_map{__fixreplies} } ) {
+        my $frusers;
+        foreach my $fruser ( sort keys %{ $id_map{__fixreplies}{$suser} } ) {
+            $frusers = $frusers ? "$frusers, $fruser" : $fruser;
+        }
+        if ($frusers) {
+            $found = 1;
+            &notice("Following all replies as \@$suser: $frusers");
+        }
+    }
+
+    unless ($found) {
+        &notice("Not following all replies by anyone");
+    }
+}
+
 sub cmd_add_search {
     my ( $data, $server, $win ) = @_;
 
@@ -764,13 +847,13 @@ sub get_updates {
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     binmode( $fh, ":utf8" );
-    my $pid = fork();
+    $child_pid = fork();
 
-    if ($pid) {    # parent
+    if ($child_pid) {    # parent
         Irssi::timeout_add_once( 5000, 'monitor_child',
             [ "$filename.done", 0 ] );
-        Irssi::pidwait_add($pid);
-    } elsif ( defined $pid ) {    # child
+        Irssi::pidwait_add($child_pid);
+    } elsif ( defined $child_pid ) {    # child
         close STDIN;
         close STDOUT;
         close STDERR;
@@ -781,6 +864,20 @@ sub get_updates {
         my %context_cache;
         foreach ( keys %twits ) {
             $error++ unless &do_updates( $fh, $_, $twits{$_}, \%context_cache );
+
+            if ( $id_map{__fixreplies}{$_} ) {
+                my @frusers = sort keys %{ $id_map{__fixreplies}{$_} };
+
+                $error++
+                  unless &get_timeline( $fh, $frusers[ $fix_replies_index{$_} ],
+                          $_, $twits{$_}, \%context_cache );
+
+                $fix_replies_index{$_}++;
+                $fix_replies_index{$_} = 0
+                  if $fix_replies_index{$_} >= @frusers;
+                print $fh
+"id:$fix_replies_index{$_} account:$_ type:fix_replies_index\n";
+            }
         }
 
         print $fh "__friends__\n";
@@ -889,7 +986,7 @@ sub do_updates {
                         " -- http://twitter.com/$context->{user}{screen_name}"
                       . "/status/$context->{id}";
                 }
-                printf $fh "id:%u account:%s nick:%s type:tweet %s\n",
+                printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 $reply = "reply";
@@ -902,14 +999,16 @@ sub do_updates {
             $text .= " -- http://twitter.com/$t->{user}{screen_name}"
               . "/status/$t->{id}";
         }
-        printf $fh "id:%u account:%s nick:%s type:%s %s\n",
+        printf $fh "id:%s account:%s nick:%s type:%s %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
         $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
     }
-    printf $fh "id:%u account:%s type:last_id timeline\n",
+    printf $fh "id:%s account:%s type:last_id timeline\n",
       $new_poll_id, $username;
 
-    print scalar localtime, " - Polling for replies" if &debug;
+    print scalar localtime, " - Polling for replies since ",
+      $id_map{__last_id}{$username}{reply}
+      if &debug;
     $new_poll_id = 0;
     eval {
         if ( $id_map{__last_id}{$username}{reply} )
@@ -937,11 +1036,11 @@ sub do_updates {
             $text .= " -- http://twitter.com/$t->{user}{screen_name}"
               . "/status/$t->{id}";
         }
-        printf $fh "id:%u account:%s nick:%s type:tweet %s\n",
+        printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $text;
         $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
     }
-    printf $fh "id:%u account:%s type:last_id reply\n", $new_poll_id, $username;
+    printf $fh "id:%s account:%s type:last_id reply\n", $new_poll_id, $username;
 
     print scalar localtime, " - Polling for DMs" if &debug;
     $new_poll_id = 0;
@@ -964,11 +1063,11 @@ sub do_updates {
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
         $text =~ s/[\n\r]/ /g;
-        printf $fh "id:%u account:%s nick:%s type:dm %s\n",
+        printf $fh "id:%s account:%s nick:%s type:dm %s\n",
           $t->{id}, $username, $t->{sender_screen_name}, $text;
         $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
     }
-    printf $fh "id:%u account:%s type:last_id dm\n", $new_poll_id, $username;
+    printf $fh "id:%s account:%s type:last_id dm\n", $new_poll_id, $username;
 
     print scalar localtime, " - Polling for subscriptions" if &debug;
     if ( $obj->can('search') and $id_map{__searches}{$username} ) {
@@ -998,13 +1097,13 @@ sub do_updates {
             }
 
             $id_map{__searches}{$username}{$topic} = $search->{max_id};
-            printf $fh "id:%u account:%s type:searchid topic:%s\n",
+            printf $fh "id:%s account:%s type:searchid topic:%s\n",
               $search->{max_id}, $username, $topic;
 
             foreach my $t ( reverse @{ $search->{results} } ) {
                 my $text = decode_entities( $t->{text} );
                 $text =~ s/[\n\r]/ /g;
-                printf $fh "id:%u account:%s nick:%s type:search topic:%s %s\n",
+                printf $fh "id:%s account:%s nick:%s type:search topic:%s %s\n",
                   $t->{id}, $username, $t->{from_user}, $topic, $text;
                 $new_poll_id = $t->{id}
                   if not $new_poll_id
@@ -1018,6 +1117,83 @@ sub do_updates {
     return 1;
 }
 
+sub get_timeline {
+    my ( $fh, $target, $username, $obj, $cache ) = @_;
+    print $fh
+"type:debug get_timeline($fix_replies_index{$username}=$target) started.  username = $username\n";
+    my $tweets;
+    eval {
+        $tweets = $obj->user_timeline(
+            {
+                id       => $target,
+                since_id => $id_map{__last_id}{$username}{$target}
+            }
+        );
+    };
+
+    if ($@) {
+        print $fh
+          "type:debug Error during user_timeline($target) call: Aborted.\n";
+        print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
+        return undef;
+    }
+
+    unless ($tweets) {
+        print $fh
+          "type:debug user_timeline($target) call returned undef!  Aborted\n";
+        return 1;
+    }
+
+    foreach my $t ( reverse @$tweets ) {
+        my $text = decode_entities( $t->{text} );
+        $text =~ s/[\n\r]/ /g;
+        my $reply = "tweet";
+        if (    Irssi::settings_get_bool("show_reply_context")
+            and $t->{in_reply_to_screen_name} ne $username
+            and $t->{in_reply_to_screen_name}
+            and not exists $friends{ $t->{in_reply_to_screen_name} } )
+        {
+            $nicks{ $t->{in_reply_to_screen_name} } = time;
+            my $context;
+            unless ( $cache->{ $t->{in_reply_to_status_id} } ) {
+                eval {
+                    $cache->{ $t->{in_reply_to_status_id} } =
+                      $obj->show_status( $t->{in_reply_to_status_id} );
+                };
+
+            }
+            $context = $cache->{ $t->{in_reply_to_status_id} };
+
+            if ($context) {
+                my $ctext = decode_entities( $context->{text} );
+                $ctext =~ s/[\n\r]/ /g;
+                if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
+                    $ctext .=
+                        " -- http://twitter.com/$context->{user}{screen_name}"
+                      . "/status/$context->{id}";
+                }
+                printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
+                  $context->{id}, $username,
+                  $context->{user}{screen_name}, $ctext;
+                $reply = "reply";
+            }
+        }
+        if ( $t->{truncated} and ref($obj) ne 'Net::Identica' ) {
+            $text .= " -- http://twitter.com/$t->{user}{screen_name}"
+              . "/status/$t->{id}";
+        }
+        printf $fh "id:%s account:%s nick:%s type:%s %s\n",
+          $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+        $id_map{__last_id}{$username}{$target} = $t->{id} if
+            $id_map{__last_id}{$username}{$target} < $t->{id};
+    }
+    printf $fh "id:%s account:%s type:last_id_fixreplies %s\n", 
+               $id_map{__last_id}{$username}{$target},
+               $username, $target;
+
+    return 1;
+}
+
 sub monitor_child {
     my ($data)   = @_;
     my $filename = $data->[0];
@@ -1031,6 +1207,7 @@ sub monitor_child {
     # pretend
 
     if ( open FILE, $filename ) {
+        binmode FILE, ":utf8";
         my @lines;
         my %new_cache;
         while (<FILE>) {
@@ -1049,6 +1226,13 @@ sub monitor_child {
                 }
             }
 
+            if ( $meta{type} and $meta{type} eq 'fix_replies_index' ) {
+                $fix_replies_index{ $meta{account} } = $meta{id};
+                print "fix_replies_index for $meta{account} set to $meta{id}"
+                  if &debug;
+                next;
+            }
+
             if ( not $meta{type} or $meta{type} !~ /searchid|last_id/ ) {
                 if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
                     next;
@@ -1143,6 +1327,11 @@ sub monitor_child {
                   $meta{id}
                   if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
                       $meta{id};
+            } elsif ( $meta{type} eq 'last_id_fixreplies' ) {
+                $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} =
+                  $meta{id}
+                  if $id_map{__last_id}{"$meta{account}\@$meta{service}"}{$_} <
+                      $meta{id};
             } elsif ( $meta{type} eq 'error' ) {
                 push @lines, [ MSGLEVEL_MSGS, $_ ];
             } elsif ( $meta{type} eq 'debug' ) {
@@ -1161,8 +1350,16 @@ sub monitor_child {
             }
 
             if (/^-- (\d+)$/) {
-                ($new_last_poll) = ($1);
-                last;
+                $new_last_poll = $1;
+                if ( $new_last_poll >= $last_poll ) {
+                    last;
+                } else {
+                    print "Impossible!  ",
+                      "new_last_poll=$new_last_poll < last_poll=$last_poll!"
+                      if &debug;
+                    undef $new_last_poll;
+                    next;
+                }
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
@@ -1200,6 +1397,9 @@ sub monitor_child {
             }
             $last_poll = $new_last_poll;
 
+            # make sure the pid is removed from the waitpid list
+            Irssi::pidwait_remove($child_pid);
+
             # save id_map hash
             if ( keys %id_map
                 and my $file =
@@ -1423,7 +1623,7 @@ sub shorten {
                     "Set short_url_args to username,API_key or change your",
                     "short_url_provider."
                 );
-                return $data;
+                return decode "utf8", $data;
             }
         }
 
@@ -1499,6 +1699,7 @@ Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
     ".irssi/scripts/twirssi.json" );
 
 Irssi::settings_add_int( "twirssi", "twitter_friends_poll", 600 );
+Irssi::settings_add_int( "twirssi", "twitter_timeout",      30 );
 
 Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta",      0 );
 Irssi::settings_add_bool( "twirssi", "tweet_to_away",             0 );
@@ -1513,6 +1714,7 @@ Irssi::settings_add_bool( "twirssi", "twirssi_notify_timeouts",   1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_hilights",          1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_always_shorten",    0 );
 Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
+Irssi::settings_add_bool( "twirssi", "twirssi_avoid_ssl",         0 );
 
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
@@ -1544,6 +1746,9 @@ if ($window) {
     Irssi::command_bind( "twitter_list_subscriptions", "cmd_list_search" );
     Irssi::command_bind( "twirssi_upgrade",            "cmd_upgrade" );
     Irssi::command_bind( "twitter_updates",            "get_updates" );
+    Irssi::command_bind( "twitter_add_follow_extra",   "cmd_add_follow" );
+    Irssi::command_bind( "twitter_del_follow_extra",   "cmd_del_follow" );
+    Irssi::command_bind( "twitter_list_follow_extra",  "cmd_list_follow" );
     Irssi::command_bind( "bitlbee_away",               "update_away" );
     if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
         Irssi::command_bind( "reply",    "cmd_reply" );
@@ -1569,11 +1774,22 @@ if ($window) {
     Irssi::command_bind(
         "twirssi_version",
         sub {
-            &notice("Twirssi v$VERSION (r$REV); "
-                  . "Net::Twitter v$Net::Twitter::VERSION. "
+            &notice(
+                "Twirssi v$VERSION (r$REV); "
+                  . (
+                    $Net::Twitter::VERSION
+                    ? "Net::Twitter v$Net::Twitter::VERSION. "
+                    : ""
+                  )
+                  . (
+                    $Net::Identica::VERSION
+                    ? "Net::Identica v$Net::Identica::VERSION. "
+                    : ""
+                  )
                   . "JSON in use: "
                   . JSON::Any::handler()
-                  . ".  See details at http://twirssi.com/" );
+                  . ".  See details at http://twirssi.com/"
+            );
         }
     );
     Irssi::command_bind(
@@ -1600,6 +1816,22 @@ if ($window) {
             sub { &notice("Device updated to $_[0]"); }
         )
     );
+    Irssi::command_bind(
+        "twitter_block",
+        &gen_cmd(
+            "/twitter_block <username>",
+            "create_block",
+            sub { &notice("Blocked $_[0]"); }
+        )
+    );
+    Irssi::command_bind(
+        "twitter_unblock",
+        &gen_cmd(
+            "/twitter_unblock <username>",
+            "destroy_block",
+            sub { &notice("Unblock $_[0]"); }
+        )
+    );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
@@ -1620,6 +1852,7 @@ if ($window) {
                 &notice( sprintf "Loaded old replies from %d contact%s.",
                     $num, ( $num == 1 ? "" : "s" ) );
                 &cmd_list_search;
+                &cmd_list_follow;
             };
         } else {
             &notice("Failed to load old replies from $file: $!");