r676 - perltidy. Also, give an error if we failed to save a beta download.

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

diff --git a/twirssi.pl b/twirssi.pl
index 6a19972755a3c099b29d22ec094ce5544bd09399..68dfac8d6c3fb2aea85e79d58e4cccb41a85bd34 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -6,12 +6,13 @@ use HTML::Entities;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;

+use Encode;

 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.2.5beta";
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "2.2.5beta";

-my ($REV) = '$Rev: 659 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 676 $' =~ /(\d+)/;

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


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

-    changed => '$Date: 2009-07-02 12:48:40 -0700 (Thu, 02 Jul 2009) $',
+    changed => '$Date: 2009-07-22 11:05:52 -0700 (Wed, 22 Jul 2009) $',

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


@@ -182,7 +183,8 @@ sub cmd_retweet_as {
         unless (
             $twits{$username}->update(
                 {
         unless (
             $twits{$username}->update(
                 {

-                    status                => $data,
+                    status => $data,
+

                     # in_reply_to_status_id => $id_map{ lc $nick }[$id]
                 }
             )
                     # in_reply_to_status_id => $id_map{ lc $nick }[$id]
                 }
             )


@@ -662,10 +664,17 @@ sub cmd_upgrade {
     &notice("Downloading twirssi from $URL");
     LWP::Simple::getstore( $URL, "$loc.upgrade" );
 
     &notice("Downloading twirssi from $URL");
     LWP::Simple::getstore( $URL, "$loc.upgrade" );
 

+    unless ( -s "$loc.upgrade" ) {
+        &notice("Failed to save $loc.upgrade."
+              . "  Check that /set twirssi_location is set to the correct location."
+        );
+        return;
+    }
+

     unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
         unless ( open( NEW, "$loc.upgrade" ) ) {
     unless ( $data or Irssi::settings_get_bool("twirssi_upgrade_beta") ) {
         unless ( open( NEW, "$loc.upgrade" ) ) {

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

             );
             return;
         }
             );
             return;
         }


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

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

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


@@ -800,6 +810,7 @@ sub get_updates {
             print $fh "-- $new_poll";
         }
         close $fh;
             print $fh "-- $new_poll";
         }
         close $fh;

+        rename $filename, "$filename.done";

         exit;
     } else {
         &ccrap("Failed to fork for updating: $!");
         exit;
     } else {
         &ccrap("Failed to fork for updating: $!");


@@ -852,7 +863,7 @@ sub do_updates {
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );

-        $text = &hilight($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
         my $reply = "tweet";
         if (    Irssi::settings_get_bool("show_reply_context")
             and $t->{in_reply_to_screen_name} ne $username


@@ -872,7 +883,7 @@ sub do_updates {
 
             if ($context) {
                 my $ctext = decode_entities( $context->{text} );
 
             if ($context) {
                 my $ctext = decode_entities( $context->{text} );

-                $ctext = &hilight($ctext);
+                $ctext =~ s/[\n\r]/ /g;

                 if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
                     $ctext .=
                         " -- http://twitter.com/$context->{user}{screen_name}"
                 if ( $context->{truncated} and ref($obj) ne 'Net::Identica' ) {
                     $ctext .=
                         " -- http://twitter.com/$context->{user}{screen_name}"


@@ -921,7 +932,7 @@ sub do_updates {
           if exists $friends{ $t->{user}{screen_name} };
 
         my $text = decode_entities( $t->{text} );
           if exists $friends{ $t->{user}{screen_name} };
 
         my $text = decode_entities( $t->{text} );

-        $text = &hilight($text);
+        $text =~ s/[\n\r]/ /g;

         if ( $t->{truncated} ) {
             $text .= " -- http://twitter.com/$t->{user}{screen_name}"
               . "/status/$t->{id}";
         if ( $t->{truncated} ) {
             $text .= " -- http://twitter.com/$t->{user}{screen_name}"
               . "/status/$t->{id}";


@@ -952,7 +963,7 @@ sub do_updates {
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );

-        $text = &hilight($text);
+        $text =~ s/[\n\r]/ /g;

         printf $fh "id:%u 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 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};


@@ -992,7 +1003,7 @@ sub do_updates {
 
             foreach my $t ( reverse @{ $search->{results} } ) {
                 my $text = decode_entities( $t->{text} );
 
             foreach my $t ( reverse @{ $search->{results} } ) {
                 my $text = decode_entities( $t->{text} );

-                $text = &hilight($text);
+                $text =~ s/[\n\r]/ /g;

                 printf $fh "id:%u 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:%u account:%s nick:%s type:search topic:%s %s\n",
                   $t->{id}, $username, $t->{from_user}, $topic, $text;
                 $new_poll_id = $t->{id}


@@ -1167,7 +1178,8 @@ sub monitor_child {
                     $window->printformat(
                         $line->[0],
                         "twirssi_" . $line->[1],
                     $window->printformat(
                         $line->[0],
                         "twirssi_" . $line->[1],

-                        @$line[ 2 .. $#$line ]
+                        @$line[ 2 .. $#$line - 1 ],
+                        &hilight( $line->[-1] )

                     );
                 }
             }
                     );
                 }
             }


@@ -1428,7 +1440,7 @@ sub shorten {
         }
     }
 
         }
     }
 

-    return $data;
+    return decode "utf8", $data;

 }
 
 sub normalize_username {
 }
 
 sub normalize_username {