2.2.6 - (corrected version number)

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

diff --git a/twirssi.pl b/twirssi.pl
index 92f60b6cbeb20eb3b7197a60a860f404b2d3e2ea..785b127b0fed8d4d3652d3cbe35b5643408f9d3f 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,7 +11,7 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.2.6beta";
+$VERSION = "2.2.6";
 my ($REV) = '$Rev: 687 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
@@ -513,6 +513,15 @@ sub cmd_login {
 
     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 );
@@ -538,25 +547,12 @@ 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;
         return 1;
     } else {
         &notice("Login 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." );
-        }
     }
 }
 
@@ -909,9 +905,8 @@ 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",
-                  $context->{id}, $username,
-                  $context->{user}{screen_name}, $ctext;
+                printf $fh "id:$context->{id} account:%s nick:%s type:tweet %s\n",
+                  $username, $context->{user}{screen_name}, $ctext;
                 $reply = "reply";
             }
         }
@@ -922,12 +917,12 @@ 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",
-          $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+        printf $fh "id:$t->{id} account:%s nick:%s type:%s %s\n",
+          $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",
-      $new_poll_id, $username;
+    printf $fh "id:$new_poll_id account:%s type:last_id timeline\n",
+       $username;
 
     print scalar localtime, " - Polling for replies since ",
       $id_map{__last_id}{$username}{reply}
@@ -959,11 +954,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",
-          $t->{id}, $username, $t->{user}{screen_name}, $text;
+        printf $fh "id:$t->{id} account:%s nick:%s type:tweet %s\n",
+           $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:$new_poll_id account:%s type:last_id reply\n", $username;
 
     print scalar localtime, " - Polling for DMs" if &debug;
     $new_poll_id = 0;
@@ -986,11 +981,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",
-          $t->{id}, $username, $t->{sender_screen_name}, $text;
+        printf $fh "id:$t->{id} account:%s nick:%s type:dm %s\n",
+          $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:$new_poll_id account:%s type:last_id dm\n", $username;
 
     print scalar localtime, " - Polling for subscriptions" if &debug;
     if ( $obj->can('search') and $id_map{__searches}{$username} ) {
@@ -1020,14 +1015,14 @@ sub do_updates {
             }
 
             $id_map{__searches}{$username}{$topic} = $search->{max_id};
-            printf $fh "id:%u account:%s type:searchid topic:%s\n",
-              $search->{max_id}, $username, $topic;
+            printf $fh "id:$search->{max_id} account:%s type:searchid topic:%s\n",
+              $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",
-                  $t->{id}, $username, $t->{from_user}, $topic, $text;
+                printf $fh "id:$t->{id} account:%s nick:%s type:search topic:%s %s\n",
+                  $username, $t->{from_user}, $topic, $text;
                 $new_poll_id = $t->{id}
                   if not $new_poll_id
                       or $t->{id} < $new_poll_id;
@@ -1457,7 +1452,7 @@ sub shorten {
                     "Set short_url_args to username,API_key or change your",
                     "short_url_provider."
                 );
-                return $data;
+                return decode "utf8", $data;
             }
         }