1.7.3 - r354 - Strip out newlines from incoming tweets

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

diff --git a/twirssi.pl b/twirssi.pl
index 6e6b8a500257507bd6358d55ac26c021f24f4f87..c3ce58ff86b77922834e74b5add39168246a79e5 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -1,7 +1,6 @@
 use strict;
 use Irssi;
 use Irssi::Irc;
 use strict;
 use Irssi;
 use Irssi::Irc;

-use Net::Twitter;

 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;
 use HTTP::Date;
 use HTML::Entities;
 use File::Temp;


@@ -9,10 +8,18 @@ use LWP::Simple;
 use Data::Dumper;
 $Data::Dumper::Indent = 1;
 
 use Data::Dumper;
 $Data::Dumper::Indent = 1;
 

+BEGIN {
+    $ENV{JSON_ANY_ORDER} = "JSON Syck DWIW";
+    require JSON::Any;
+    import JSON::Any;
+    require Net::Twitter;
+    import Net::Twitter;
+}
+

 use vars qw($VERSION %IRSSI);
 
 use vars qw($VERSION %IRSSI);
 

-$VERSION = "1.7.1";
-my ($REV) = '$Rev: 345 $' =~ /(\d+)/;
+$VERSION = "1.7.3";
+my ($REV) = '$Rev: 354 $' =~ /(\d+)/;

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


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

-    changed => '$Date: 2009-01-06 07:14:03 -0800 (Tue, 06 Jan 2009) $',
+    changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $',

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


@@ -38,10 +45,7 @@ my %id_map;
 sub cmd_direct {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_direct {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     my ( $target, $text ) = split ' ', $data, 2;
     unless ( $target and $text ) {
 
     my ( $target, $text ) = split ' ', $data, 2;
     unless ( $target and $text ) {


@@ -55,10 +59,7 @@ sub cmd_direct {
 sub cmd_direct_as {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_direct_as {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     my ( $username, $target, $text ) = split ' ', $data, 3;
     unless ( $username and $target and $text ) {
 
     my ( $username, $target, $text ) = split ' ', $data, 3;
     unless ( $username and $target and $text ) {


@@ -66,10 +67,7 @@ sub cmd_direct_as {
         return;
     }
 
         return;
     }
 

-    unless ( exists $twits{$username} ) {
-        &notice("Unknown username $username");
-        return;
-    }
+    return unless &valid_username($username);

 
     eval {
         unless ( $twits{$username}
 
     eval {
         unless ( $twits{$username}


@@ -92,10 +90,7 @@ sub cmd_direct_as {
 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_tweet {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {
 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {


@@ -109,10 +104,7 @@ sub cmd_tweet {
 sub cmd_tweet_as {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_tweet_as {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     $data =~ s/^\s+|\s+$//;
     my ( $username, $data ) = split ' ', $data, 2;
 
     $data =~ s/^\s+|\s+$//;
     my ( $username, $data ) = split ' ', $data, 2;


@@ -122,10 +114,7 @@ sub cmd_tweet_as {
         return;
     }
 
         return;
     }
 

-    unless ( exists $twits{$username} ) {
-        &notice("Unknown username $username");
-        return;
-    }
+    return unless &valid_username($username);

 
     if ( Irssi::settings_get_str("short_url_provider") ) {
         foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
 
     if ( Irssi::settings_get_str("short_url_provider") ) {
         foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {


@@ -136,11 +125,7 @@ sub cmd_tweet_as {
         }
     }
 
         }
     }
 

-    if ( length $data > 140 ) {
-        &notice(
-            "Tweet too long (" . length($data) . " characters) - aborted" );
-        return;
-    }
+    return if &too_long($data);

 
     eval {
         unless ( $twits{$username}->update($data) )
 
     eval {
         unless ( $twits{$username}->update($data) )


@@ -159,21 +144,7 @@ sub cmd_tweet_as {
         $nicks{$1} = time;
     }
 
         $nicks{$1} = time;
     }
 

-    my $away = 0;
-    if (    Irssi::settings_get_bool("tweet_to_away")
-        and $data !~ /\@\w/
-        and $data !~ /^[dD] / )
-    {
-        my $server =
-          Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") );
-        if ($server) {
-            $server->send_raw("away :$data");
-            $away = 1;
-        } else {
-            &notice( "Can't find bitlbee server.",
-                "Update bitlbee_server or disable tweet_to_away" );
-        }
-    }
+    my $away = &update_away($data);

 
     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }
 
     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }


@@ -181,10 +152,7 @@ sub cmd_tweet_as {
 sub cmd_reply {
     my ( $data, $server, $win ) = @_;
 
 sub cmd_reply {
     my ( $data, $server, $win ) = @_;
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {
 
     $data =~ s/^\s+|\s+$//;
     unless ($data) {


@@ -212,10 +180,7 @@ sub cmd_reply_as {
         return;
     }
 
         return;
     }
 

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+    return unless &logged_in($twit);

 
     $data =~ s/^\s+|\s+$//;
     my ( $username, $id, $data ) = split ' ', $data, 3;
 
     $data =~ s/^\s+|\s+$//;
     my ( $username, $id, $data ) = split ' ', $data, 3;


@@ -225,15 +190,12 @@ sub cmd_reply_as {
         return;
     }
 
         return;
     }
 

-    unless ( exists $twits{$username} ) {
-        &notice("Unknown username $username");
-        return;
-    }
+    return unless &valid_username($username);

 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
     ( $nick, $id ) = split /:/, $id;
 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
     ( $nick, $id ) = split /:/, $id;

-    unless ( exists $id_map{lc $nick} ) {
+    unless ( exists $id_map{ lc $nick } ) {

         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }
         &notice("Can't find a tweet from $nick to reply to!");
         return;
     }


@@ -257,11 +219,7 @@ sub cmd_reply_as {
         }
     }
 
         }
     }
 

-    if ( length $data > 140 ) {
-        &notice(
-            "Tweet too long (" . length($data) . " characters) - aborted" );
-        return;
-    }
+    return if &too_long($data);

 
     eval {
         unless (
 
     eval {
         unless (


@@ -287,21 +245,7 @@ sub cmd_reply_as {
         $nicks{$1} = time;
     }
 
         $nicks{$1} = time;
     }
 

-    my $away = 0;
-    if (    Irssi::settings_get_bool("tweet_to_away")
-        and $data !~ /\@\w/
-        and $data !~ /^[dD] / )
-    {
-        my $server =
-          Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") );
-        if ($server) {
-            $server->send_raw("away :$data");
-            $away = 1;
-        } else {
-            &notice( "Can't find bitlbee server.",
-                "Update bitlbee_server or disalbe tweet_to_away" );
-        }
-    }
+    my $away = &update_away($data);

 
     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }
 
     &notice( "Update sent" . ( $away ? " (and away msg set)" : "" ) );
 }


@@ -312,10 +256,7 @@ sub gen_cmd {
     return sub {
         my ( $data, $server, $win ) = @_;
 
     return sub {
         my ( $data, $server, $win ) = @_;
 

-        unless ($twit) {
-            &notice("Not logged in!  Use /twitter_login username pass!");
-            return;
-        }
+        return unless &logged_in($twit);

 
         $data =~ s/^\s+|\s+$//;
         unless ($data) {
 
         $data =~ s/^\s+|\s+$//;
         unless ($data) {


@@ -357,12 +298,12 @@ sub cmd_logout {
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;
     my ( $data, $server, $win ) = @_;
 
     $data =~ s/^\s+|\s+$//g;

-    if ( $data and exists $twits{$data} ) {
+    return unless &valid_username($data);
+
+    if ($data) {

         &notice("Logging out $data...");
         $twits{$data}->end_session();
         delete $twits{$data};
         &notice("Logging out $data...");
         $twits{$data}->end_session();
         delete $twits{$data};

-    } elsif ($data) {
-        &notice("Unknown username '$data'");

     } else {
         &notice("Logging out $user...");
         $twit->end_session();
     } else {
         &notice("Logging out $user...");
         $twit->end_session();


@@ -553,7 +494,8 @@ sub load_friends {
     eval {
         while (1)
         {
     eval {
         while (1)
         {

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

             my $friends = $twit->friends( { page => $page } );
             last unless $friends;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;
             my $friends = $twit->friends( { page => $page } );
             last unless $friends;
             $new_friends{ $_->{screen_name} } = time foreach @$friends;


@@ -563,19 +505,20 @@ sub load_friends {
     };
 
     if ($@) {
     };
 
     if ($@) {

-        &notice("Error during friends list update.  Aborted.");
+        print $fh "type:debug Error during friends list update.  Aborted.\n";

         return;
     }
 
     my ( $added, $removed ) = ( 0, 0 );
         return;
     }
 
     my ( $added, $removed ) = ( 0, 0 );

-    print $fh "Scanning for new friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for new friends...\n" if ( $fh and &debug );

     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
         $added++;
     }
 
     foreach ( keys %new_friends ) {
         next if exists $friends{$_};
         $friends{$_} = time;
         $added++;
     }
 

-    print $fh "Scanning for removed friends...\n" if ( $fh and &debug );
+    print $fh "type:debug Scanning for removed friends...\n"
+      if ( $fh and &debug );

     foreach ( keys %friends ) {
         next if exists $new_friends{$_};
         delete $friends{$_};
     foreach ( keys %friends ) {
         next if exists $new_friends{$_};
         delete $friends{$_};


@@ -596,10 +539,8 @@ sub get_updates {
               . Irssi::settings_get_str('twitter_window')
               . "'.  Create it or change the value of twitter_window" );
     }
               . Irssi::settings_get_str('twitter_window')
               . "'.  Create it or change the value of twitter_window" );
     }

-    unless ($twit) {
-        &notice("Not logged in!  Use /twitter_login username pass!");
-        return;
-    }
+
+    return unless &logged_in($twit);

 
     my ( $fh, $filename ) = File::Temp::tempfile();
     my $pid = fork();
 
     my ( $fh, $filename ) = File::Temp::tempfile();
     my $pid = fork();


@@ -623,7 +564,7 @@ sub get_updates {
 
         my ( $added, $removed ) = &load_friends($fh);
         if ( $added + $removed ) {
 
         my ( $added, $removed ) = &load_friends($fh);
         if ( $added + $removed ) {

-            print $fh "%R***%n Friends list updated: ",
+            print $fh "type:debug %R***%n Friends list updated: ",

               join( ", ",
                 sprintf( "%d added",   $added ),
                 sprintf( "%d removed", $removed ) ),
               join( ", ",
                 sprintf( "%d added",   $added ),
                 sprintf( "%d removed", $removed ) ),


@@ -635,7 +576,7 @@ sub get_updates {
         }
 
         if ($error) {
         }
 
         if ($error) {

-            print $fh "type:error Update encountered errors.  Aborted\n";
+            print $fh "type:debug Update encountered errors.  Aborted\n";

             print $fh $last_poll;
         } else {
             print $fh $new_poll;
             print $fh $last_poll;
         } else {
             print $fh $new_poll;


@@ -653,12 +594,22 @@ sub do_updates {
     my $tweets;
     eval {
         $tweets = $obj->friends_timeline(
     my $tweets;
     eval {
         $tweets = $obj->friends_timeline(

-            { since => HTTP::Date::time2str($last_poll) } )
-          || [];
+            { since => HTTP::Date::time2str($last_poll) } );

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

-        print $fh "type:error Error during friends_timeline call.  Aborted.\n";
+        print $fh "type:debug Error during friends_timeline call.  Aborted.\n";
+        return 1;
+    }
+
+    unless ( ref $tweets ) {
+        if ( $obj->can("get_error") ) {
+            print $fh "type:debug API Error during friends_timeline call: ",
+              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+        } else {
+            print $fh
+              "type:debug API Error during friends_timeline call. Aborted.\n";
+        }

         return 1;
     }
 
         return 1;
     }
 


@@ -666,6 +617,7 @@ sub do_updates {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

+        $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


@@ -673,17 +625,25 @@ sub do_updates {
             and not exists $friends{ $t->{in_reply_to_screen_name} } )
         {
             $nicks{ $t->{in_reply_to_screen_name} } = time;
             and not exists $friends{ $t->{in_reply_to_screen_name} } )
         {
             $nicks{ $t->{in_reply_to_screen_name} } = time;

-            my $context = $obj->show_status( $t->{in_reply_to_status_id} );
+            my $context;
+            eval {
+                $context = $obj->show_status( $t->{in_reply_to_status_id} );
+            };
+

             if ($context) {
                 my $ctext = decode_entities( $context->{text} );
                 $ctext =~ s/%/%%/g;
                 $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
             if ($context) {
                 my $ctext = decode_entities( $context->{text} );
                 $ctext =~ s/%/%%/g;
                 $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

+                $ctext =~ s/[\n\r]/ /g;

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

+            } elsif ($@) {
+                print $fh "type:debug request to get context failed: $@";

             } else {
             } else {

-                print "Failed to get context from $t->{in_reply_to_screen_name}"
+                print $fh
+"type:debug Failed to get context from $t->{in_reply_to_screen_name}"

                   if &debug;
             }
         }
                   if &debug;
             }
         }


@@ -701,7 +661,7 @@ sub do_updates {
     };
 
     if ($@) {
     };
 
     if ($@) {

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

         return 1;
     }
 
         return 1;
     }
 


@@ -712,6 +672,7 @@ sub do_updates {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

+        $text =~ s/[\n\r]/ /g;

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


@@ -724,7 +685,7 @@ sub do_updates {
     };
 
     if ($@) {
     };
 
     if ($@) {

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

         return 1;
     }
 
         return 1;
     }
 


@@ -732,6 +693,7 @@ sub do_updates {
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
         my $text = decode_entities( $t->{text} );
         $text =~ s/%/%%/g;
         $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;

+        $text =~ s/[\n\r]/ /g;

         printf $fh "id:%d account:%s nick:%s type:dm %s\n",
           $t->{id}, $username, $t->{sender_screen_name}, $text;
     }
         printf $fh "id:%d account:%s nick:%s type:dm %s\n",
           $t->{id}, $username, $t->{sender_screen_name}, $text;
     }


@@ -741,11 +703,13 @@ sub do_updates {
 }
 
 sub monitor_child {
 }
 
 sub monitor_child {

-    my ( $data, $attempt ) = @_;
+    my ($data)   = @_;

     my $filename = $data->[0];
     my $filename = $data->[0];

+    my $attempt  = $data->[1];

 
 

-    print scalar localtime, " - checking child log at $filename" if &debug;
-    my $old_last_poll = $last_poll;
+    print scalar localtime, " - checking child log at $filename ($attempt)"
+      if &debug;
+    my $new_last_poll;

     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {
     if ( open FILE, $filename ) {
         my @lines;
         while (<FILE>) {


@@ -753,11 +717,12 @@ sub monitor_child {
             last if /^__friends__/;
             my %meta;
             foreach my $key (qw/id account nick type/) {
             last if /^__friends__/;
             my %meta;
             foreach my $key (qw/id account nick type/) {

-                s/^$key:(\S+)\s*//;
-                $meta{$key} = $1;
+                if (s/^$key:(\S+)\s*//) {
+                    $meta{$key} = $1;
+                }

             }
 
             }
 

-            next if exists $tweet_cache{ $meta{id} };
+            next if exists $meta{id} and exists $tweet_cache{ $meta{id} };

             $tweet_cache{ $meta{id} } = time;
             my $account = "";
             if ( $meta{account} ne $user ) {
             $tweet_cache{ $meta{id} } = time;
             my $account = "";
             if ( $meta{account} ne $user ) {


@@ -783,24 +748,26 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
             } elsif ( $meta{type} eq 'error' ) {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
             } elsif ( $meta{type} eq 'error' ) {

-                push @lines, "error: $_\n" if &debug,;
+                push @lines, "ERROR: $_\n";

             } elsif ( $meta{type} eq 'debug' ) {
             } elsif ( $meta{type} eq 'debug' ) {

-                push @lines, "debug: $_\n" if &debug,;
+                print "$_" if &debug,;
+            } else {
+                print "Unknown line type $meta{type}: $_" if &debug,;

             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {
             }
         }
 
         %friends = ();
         while (<FILE>) {
             if (/^\d+$/) {

-                $last_poll = $_;
+                $new_last_poll = $_;

                 last;
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 
                 last;
             }
             my ( $f, $t ) = split ' ', $_;
             $nicks{$f} = $friends{$f} = $t;
         }
 

-        if ( $last_poll != $old_last_poll ) {
-            print "new last_poll = $last_poll" if &debug;
+        if ($new_last_poll) {
+            print "new last_poll = $new_last_poll" if &debug;

             foreach my $line (@lines) {
                 chomp $line;
                 $window->print( $line, MSGLEVEL_PUBLIC );
             foreach my $line (@lines) {
                 chomp $line;
                 $window->print( $line, MSGLEVEL_PUBLIC );


@@ -816,9 +783,10 @@ sub monitor_child {
 
             # keep enough cached tweets, to make sure we don't show duplicates.
             foreach ( keys %tweet_cache ) {
 
             # keep enough cached tweets, to make sure we don't show duplicates.
             foreach ( keys %tweet_cache ) {

-                next if $tweet_cache{$_} >= $old_last_poll;
+                next if $tweet_cache{$_} >= $last_poll;

                 delete $tweet_cache{$_};
             }
                 delete $tweet_cache{$_};
             }

+            $last_poll = $new_last_poll;

 
             # save id_map hash
             if ( keys %id_map
 
             # save id_map hash
             if ( keys %id_map


@@ -855,6 +823,61 @@ sub notice {
     $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
 }
 
     $window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
 }
 

+sub update_away {
+    my $data = shift;
+
+    if (    Irssi::settings_get_bool("tweet_to_away")
+        and $data !~ /\@\w/
+        and $data !~ /^[dD] / )
+    {
+        my $server =
+          Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") );
+        if ($server) {
+            $server->send_raw("away :$data");
+            return 1;
+        } else {
+            &notice( "Can't find bitlbee server.",
+                "Update bitlbee_server or disable tweet_to_away" );
+            return 0;
+        }
+    }
+
+    return 0;
+}
+
+sub too_long {
+    my $data = shift;
+
+    if ( length $data > 140 ) {
+        &notice(
+            "Tweet too long (" . length($data) . " characters) - aborted" );
+        return 1;
+    }
+
+    return 0;
+}
+
+sub valid_username {
+    my $username = shift;
+
+    unless ( exists $twits{$username} ) {
+        &notice("Unknown username $username");
+        return 0;
+    }
+
+    return 1;
+}
+
+sub logged_in {
+    my $obj = shift;
+    unless ($obj) {
+        &notice("Not logged in!  Use /twitter_login username pass!");
+        return 0;
+    }
+
+    return 1;
+}
+

 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 


@@ -925,9 +948,11 @@ if ($window) {
     Irssi::command_bind(
         "twirssi_version",
         sub {
     Irssi::command_bind(
         "twirssi_version",
         sub {

-            &notice(
-"Twirssi v$VERSION (r$REV);  Net::Twitter v$Net::Twitter::VERSION. "
-                  . "See details at http://tinyurl.com/twirssi" );
+            &notice("Twirssi v$VERSION (r$REV); "
+                  . "Net::Twitter v$Net::Twitter::VERSION. "
+                  . "JSON in use: "
+                  . JSON::Any::handler()
+                  . ".  See details at http://twirssi.com/" );

         }
     );
     Irssi::command_bind(
         }
     );
     Irssi::command_bind(