Tidy

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

diff --git a/twirssi.pl b/twirssi.pl
index 0abb396b1756e7acf3371b3e4f880d68da3b89fe..221e086162972b15a0bd4a4cf19a1c5d5a7be20e 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,9 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "2.3.0beta";
-my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
-%IRSSI = (
+$VERSION = "2.3.4beta";
+%IRSSI   = (

     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
     name        => 'twirssi',
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
     name        => 'twirssi',


@@ -176,25 +175,28 @@ sub cmd_retweet_as {
     }
     $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
 
     }
     $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
 

+    my $modified = $data;

     $data = &shorten($text);
 
     $data = &shorten($text);
 

-    return if &too_long($data);
+    return if $modified and &too_long($data);

 
     my $success = 1;
     eval {
 
     my $success = 1;
     eval {

-        unless (
-            $twits{$username}->update(
+        if ($modified)
+        {
+            $success = $twits{$username}->update(

                 {
                     status => $data,
 
                     # in_reply_to_status_id => $id_map{ lc $nick }[$id]
                 }
                 {
                     status => $data,
 
                     # in_reply_to_status_id => $id_map{ lc $nick }[$id]
                 }

-            )
-          )
-        {
-            &notice("Update failed");
-            $success = 0;
+            );
+        } else {
+            $success =
+              $twits{$username}->retweet( { id => $id_map{ lc $nick }[$id] } );
+            $success = $success->{id} if ref $success;

         }
         }

+        &notice("Update failed") unless $success;

     };
     return unless $success;
 
     };
     return unless $success;
 


@@ -491,7 +493,7 @@ sub cmd_login {
     }
     $defservice = $service = ucfirst lc $service;
 
     }
     $defservice = $service = ucfirst lc $service;
 

-    eval "use Net::$service";
+    eval "use Net::$service 3.05";

     if ($@) {
         &notice(
             "Failed to load Net::$service when trying to log in as $user: $@");
     if ($@) {
         &notice(
             "Failed to load Net::$service when trying to log in as $user: $@");


@@ -514,6 +516,7 @@ sub cmd_login {
         and $twit->can('ua') )
     {
         $twit->ua->timeout($timeout);
         and $twit->can('ua') )
     {
         $twit->ua->timeout($timeout);

+        &notice("Twitter timeout set to $timeout");

     }
 
     unless ( $twit->verify_credentials() ) {
     }
 
     unless ( $twit->verify_credentials() ) {


@@ -699,9 +702,8 @@ sub cmd_upgrade {
 
     my $loc = Irssi::settings_get_str("twirssi_location");
     unless ( -w $loc ) {
 
     my $loc = Irssi::settings_get_str("twirssi_location");
     unless ( -w $loc ) {

-        &notice( "$loc isn't writable, can't upgrade." .
-                 "  Perhaps you need to /set twirssi_location?"
-        );
+        &notice("$loc isn't writable, can't upgrade."
+              . "  Perhaps you need to /set twirssi_location?" );

         return;
     }
 
         return;
     }
 


@@ -710,9 +712,8 @@ sub cmd_upgrade {
         eval { use Digest::MD5; };
 
         if ($@) {
         eval { use Digest::MD5; };
 
         if ($@) {

-            &notice( "Failed to load Digest::MD5." . 
-                     "  Try '/twirssi_upgrade nomd5' to skip MD5 verification"
-            );
+            &notice("Failed to load Digest::MD5."
+                  . "  Try '/twirssi_upgrade nomd5' to skip MD5 verification" );

             return;
         }
 
             return;
         }
 


@@ -725,8 +726,8 @@ sub cmd_upgrade {
         }
 
         unless ( open( CUR, $loc ) ) {
         }
 
         unless ( open( CUR, $loc ) ) {

-            &notice( "Failed to read $loc." .
-                     "  Check that /set twirssi_location is set to the correct location."
+            &notice("Failed to read $loc."
+                  . "  Check that /set twirssi_location is set to the correct location."

             );
             return;
         }
             );
             return;
         }


@@ -791,20 +792,20 @@ sub cmd_upgrade {
 }
 
 sub load_friends {
 }
 
 sub load_friends {

-    my $fh   = shift;
+    my $fh     = shift;

     my $cursor = -1;
     my $cursor = -1;

-    my $page = 1;
+    my $page   = 1;

     my %new_friends;
     eval {
     my %new_friends;
     eval {

-        while ($page < 11 and $cursor ne "0")
+        while ( $page < 11 and $cursor ne "0" )

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

-            if (ref $twit =~ /^Net::Twitter/) {
+            if ( ref $twit =~ /^Net::Twitter/ ) {

                 $friends = $twit->friends( { cursor => $cursor } );
                 last unless $friends;
                 $friends = $twit->friends( { cursor => $cursor } );
                 last unless $friends;

-                $cursor = $friends->{next_cursor};
+                $cursor  = $friends->{next_cursor};

                 $friends = $friends->{users};
             } else {
                 $friends = $twit->friends( { page => $page } );
                 $friends = $friends->{users};
             } else {
                 $friends = $twit->friends( { page => $page } );


@@ -884,7 +885,7 @@ sub get_updates {
                 $fix_replies_index{$_} = 0
                   if $fix_replies_index{$_} >= @frusers;
                 print $fh "id:$fix_replies_index{$_} ",
                 $fix_replies_index{$_} = 0
                   if $fix_replies_index{$_} >= @frusers;
                 print $fh "id:$fix_replies_index{$_} ",

-                          "account:$_ type:fix_replies_index\n";
+                  "account:$_ type:fix_replies_index\n";

             }
         }
 
             }
         }
 


@@ -938,14 +939,14 @@ sub do_updates {
     eval {
         if ( $id_map{__last_id}{$username}{timeline} )
         {
     eval {
         if ( $id_map{__last_id}{$username}{timeline} )
         {

-            $tweets = $obj->friends_timeline( { count => 100 } );
+            $tweets = $obj->home_timeline( { count => 100 } );

         } else {
         } else {

-            $tweets = $obj->friends_timeline();
+            $tweets = $obj->home_timeline();

         }
     };
 
     if ($@) {
         }
     };
 
     if ($@) {

-        print $fh "type:debug Error during friends_timeline call: Aborted.\n";
+        print $fh "type:debug Error during home_timeline call: Aborted.\n";

         print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
         return undef;
     }
         print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
         return undef;
     }


@@ -956,19 +957,18 @@ sub do_updates {
             eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
             unless ($@) { $error = $obj->get_error() }
             print $fh
             eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
             unless ($@) { $error = $obj->get_error() }
             print $fh

-              "type:debug API Error during friends_timeline call: Aborted\n";
+              "type:debug API Error during home_timeline call: Aborted\n";

             print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
 
         } else {
             print $fh
             print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
 
         } else {
             print $fh

-              "type:debug API Error during friends_timeline call. Aborted.\n";
+              "type:debug API Error during home_timeline call. Aborted.\n";

         }
         return undef;
     }
 
     foreach my $t ( reverse @$tweets ) {
         }
         return undef;
     }
 
     foreach my $t ( reverse @$tweets ) {

-        my $text = decode_entities( $t->{text} );
-        $text =~ s/[\n\r]/ /g;
+        my $text = &get_text( $t, $obj );

         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username
         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username


@@ -987,13 +987,7 @@ sub do_updates {
             $context = $cache->{ $t->{in_reply_to_status_id} };
 
             if ($context) {
             $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}";
-                }
+                my $ctext = &get_text( $context, $obj );

                 printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;


@@ -1003,10 +997,6 @@ sub do_updates {
         next
           if $t->{user}{screen_name} eq $username
               and not Irssi::settings_get_bool("show_own_tweets");
         next
           if $t->{user}{screen_name} eq $username
               and not Irssi::settings_get_bool("show_own_tweets");

-        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;
         $new_poll_id = $t->{id} if $new_poll_id < $t->{id};
         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};


@@ -1038,12 +1028,7 @@ sub do_updates {
         next
           if exists $friends{ $t->{user}{screen_name} };
 
         next
           if exists $friends{ $t->{user}{screen_name} };
 

-        my $text = decode_entities( $t->{text} );
-        $text =~ s/[\n\r]/ /g;
-        if ( $t->{truncated} ) {
-            $text .= " -- http://twitter.com/$t->{user}{screen_name}"
-              . "/status/$t->{id}";
-        }
+        my $text = &get_text( $t, $obj );

         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:%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};


@@ -1109,8 +1094,7 @@ sub do_updates {
               $search->{max_id}, $username, $topic;
 
             foreach my $t ( reverse @{ $search->{results} } ) {
               $search->{max_id}, $username, $topic;
 
             foreach my $t ( reverse @{ $search->{results} } ) {

-                my $text = decode_entities( $t->{text} );
-                $text =~ s/[\n\r]/ /g;
+                my $text = &get_text( $t, $obj );

                 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}
                 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}


@@ -1130,16 +1114,14 @@ sub get_timeline {
     my $tweets;
     my $last_id = $id_map{__last_id}{$username}{$target};
 
     my $tweets;
     my $last_id = $id_map{__last_id}{$username}{$target};
 

-    print $fh "type:debug get_timeline(" .
-              "$fix_replies_index{$username}=$target > $last_id) started." .
-              "  username = $username\n";
+    print $fh "type:debug get_timeline("
+      . "$fix_replies_index{$username}=$target > $last_id) started."
+      . "  username = $username\n";

     eval {
         $tweets = $obj->user_timeline(
             {
                 id => $target,
     eval {
         $tweets = $obj->user_timeline(
             {
                 id => $target,

-                (   
-                    $last_id ? (since_id => $last_id) : ()
-                ),
+                ( $last_id ? ( since_id => $last_id ) : () ),

             }
         );
     };
             }
         );
     };


@@ -1158,8 +1140,7 @@ sub get_timeline {
     }
 
     foreach my $t ( reverse @$tweets ) {
     }
 
     foreach my $t ( reverse @$tweets ) {

-        my $text = decode_entities( $t->{text} );
-        $text =~ s/[\n\r]/ /g;
+        my $text = &get_text( $t, $obj );

         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username
         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username


@@ -1178,29 +1159,19 @@ sub get_timeline {
             $context = $cache->{ $t->{in_reply_to_status_id} };
 
             if ($context) {
             $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}";
-                }
+                my $ctext = &get_text( $context, $obj );

                 printf $fh "id:%s account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
                 $reply = "reply";
             }
         }
                 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;
         $last_id = $t->{id} if $last_id < $t->{id};
     }
     printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",
         printf $fh "id:%s account:%s nick:%s type:%s %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
         $last_id = $t->{id} if $last_id < $t->{id};
     }
     printf $fh "id:%s account:%s type:last_id_fixreplies %s\n",

-        $last_id, $username, $target;
+      $last_id, $username, $target;

 
     return 1;
 }
 
     return 1;
 }


@@ -1562,7 +1533,9 @@ sub sig_complete {
           keys %{ $id_map{__indexes} };
     }
 
           keys %{ $id_map{__indexes} };
     }
 

-    if ( $linestart =~ /^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/ )
+    if ( $linestart =~
+/^\/(twitter_unfriend|twitter_add_follow_extra|twitter_del_follow_extra)\s*$/
+      )

     {    # /twitter_unfriend gets a nick
         $word =~ s/^@//;
         push @$complist, grep /^\Q$word/i,
     {    # /twitter_unfriend gets a nick
         $word =~ s/^@//;
         push @$complist, grep /^\Q$word/i,


@@ -1605,7 +1578,7 @@ sub hilight {
     if ( Irssi::settings_get_str("twirssi_nick_color") ) {
         my $c = Irssi::settings_get_str("twirssi_nick_color");
         $c = $irssi_to_mirc_colors{$c};
     if ( Irssi::settings_get_str("twirssi_nick_color") ) {
         my $c = Irssi::settings_get_str("twirssi_nick_color");
         $c = $irssi_to_mirc_colors{$c};

-        $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c;
+        $text =~ s/(^|\W)\@(\w+)/$1\cC$c\@$2\cO/g if $c;

     }
     if ( Irssi::settings_get_str("twirssi_topic_color") ) {
         my $c = Irssi::settings_get_str("twirssi_topic_color");
     }
     if ( Irssi::settings_get_str("twirssi_topic_color") ) {
         my $c = Irssi::settings_get_str("twirssi_topic_color");


@@ -1685,6 +1658,25 @@ sub normalize_username {
     return "$username\@$service";
 }
 
     return "$username\@$service";
 }
 

+sub get_text {
+    my $tweet  = shift;
+    my $object = shift;
+    my $text   = decode_entities( $tweet->{text} );
+    if ( $tweet->{truncated} ) {
+        if ( exists $tweet->{retweeted_status} ) {
+            $text = "RT $tweet->{retweeted_status}{user}{screen_name}: "
+              . "$tweet->{retweeted_status}{text}";
+        } elsif ( $object->isa('Net::Twitter') ) {
+            $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
+              . "/status/$tweet->{id}";
+        }
+    }
+
+    $text =~ s/[\n\r]/ /g;
+
+    return $text;
+}
+

 Irssi::signal_add( "send text", "event_send_text" );
 
 Irssi::theme_register(
 Irssi::signal_add( "send text", "event_send_text" );
 
 Irssi::theme_register(


@@ -1791,7 +1783,7 @@ if ($window) {
         "twirssi_version",
         sub {
             &notice(
         "twirssi_version",
         sub {
             &notice(

-                "Twirssi v$VERSION (r$REV); "
+                "Twirssi v$VERSION; "

                   . (
                     $Net::Twitter::VERSION
                     ? "Net::Twitter v$Net::Twitter::VERSION. "
                   . (
                     $Net::Twitter::VERSION
                     ? "Net::Twitter v$Net::Twitter::VERSION. "


@@ -1850,7 +1842,7 @@ if ($window) {
     );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 
     );
     Irssi::signal_add_last( 'complete word' => \&sig_complete );
 

-    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N (r$REV)");
+    &notice("  %Y<%C(%B^%C)%N                   TWIRSSI v%R$VERSION%N");

     &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
     &notice(
         "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");
     &notice("   %C(_(\\%N           http://twirssi.com/ for full docs");
     &notice(
         "    %Y||%C `%N Log in with /twitter_login, send updates with /tweet");