r519 - Add a first shot at supporting truncated statuses -> urls

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

diff --git a/twirssi.pl b/twirssi.pl
index 0ee8ab107f96a7384b6a6e25f54447685434fb0d..8d5b813bd2a1689a44d7610ea4c103c679cb0d0a 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.1.1beta";
-my ($REV) = '$Rev: 491 $' =~ /(\d+)/;
+$VERSION = "2.1.2beta";
+my ($REV) = '$Rev: 519 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 491 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://twirssi.com',
-    changed => '$Date: 2009-02-25 10:44:26 -0800 (Wed, 25 Feb 2009) $',
+    changed => '$Date: 2009-03-07 13:30:43 -0800 (Sat, 07 Mar 2009) $',
 );
 
 my $window;
@@ -546,7 +546,7 @@ sub cmd_upgrade {
     &notice("Downloading twirssi from $URL");
     LWP::Simple::getstore( $URL, "$loc.upgrade" );
 
-    unless ($data) {
+    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."
@@ -737,6 +737,12 @@ sub do_updates {
                 printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
                   $context->{id}, $username,
                   $context->{user}{screen_name}, $ctext;
+                if ($context->{truncated}) {
+                    printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+                      $context->{id}."-url", $username,
+                      $context->{user}{screen_name}, 
+                      "http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";
+                }
                 $reply = "reply";
             } elsif ($@) {
                 print $fh "type:debug request to get context failed: $@";
@@ -751,6 +757,12 @@ sub do_updates {
               and not Irssi::settings_get_bool("show_own_tweets");
         printf $fh "id:%d account:%s nick:%s type:%s %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+        if ($t->{truncated}) {
+            printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+              $t->{id}."-url", $username,
+              $t->{user}{screen_name}, 
+              "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+        }
     }
 
     print scalar localtime, " - Polling for replies" if &debug;
@@ -772,6 +784,12 @@ sub do_updates {
         $text = &hilight($text);
         printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
           $t->{id}, $username, $t->{user}{screen_name}, $text;
+        if ($t->{truncated}) {
+            printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+              $t->{id}."-url", $username,
+              $t->{user}{screen_name}, 
+              "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+        }
     }
 
     print scalar localtime, " - Polling for DMs" if &debug;
@@ -868,6 +886,10 @@ sub monitor_child {
             }
 
             if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+                if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
+                    next;
+                }
+
                 $new_cache{ $meta{id} } = time;
 
                 if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
@@ -998,7 +1020,7 @@ sub monitor_child {
                     print JSON JSON::Any->objToJson( \%id_map );
                     close JSON;
                 } else {
-                    &notice("Failed to write replies to $file: $!");
+                    &ccrap("Failed to write replies to $file: $!");
                 }
             }
             $failwhale = 0;
@@ -1037,11 +1059,11 @@ sub monitor_child {
                 q{         '--/_.'----'`}
               )
             {
-                &notice($whale);
+                &ccrap($whale);
             }
             $failwhale = 1;
         }
-        &notice("Haven't been able to get updated tweets since $since");
+        &ccrap("Haven't been able to get updated tweets since $since");
     }
 }
 
@@ -1053,6 +1075,10 @@ sub notice {
     $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
 }
 
+sub ccrap {
+    $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+}
+
 sub update_away {
     my $data = shift;
 
@@ -1066,7 +1092,7 @@ sub update_away {
             $server->send_raw("away :$data");
             return 1;
         } else {
-            &notice( "Can't find bitlbee server.",
+            &ccrap( "Can't find bitlbee server.",
                 "Update bitlbee_server or disable tweet_to_away" );
             return 0;
         }
@@ -1211,6 +1237,10 @@ Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 $last_poll = time - &get_poll_time;
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 if ( !$window ) {
+    Irssi::active_win()
+      ->print( "Couldn't find a window named '"
+          . Irssi::settings_get_str('twitter_window')
+          . "', trying to create it." );
     $window =
       Irssi::Windowitem::window_create(
         Irssi::settings_get_str('twitter_window'), 1 );