X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/80e4d669710c85419d93922eab15a556b6ab0c36..714d0806bba11bade31e514170d247c4aa8cce81:/twirssi.pl?ds=inline

diff --git a/twirssi.pl b/twirssi.pl
index b7e1767..4decda6 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -6,20 +6,13 @@ use HTML::Entities;
 use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
+use Net::Twitter;
 $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);
 
-$VERSION = "1.7.3";
-my ($REV) = '$Rev: 352 $' =~ /(\d+)/;
+$VERSION = "1.7.6";
+my ($REV) = '$Rev: 379 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -28,7 +21,7 @@ my ($REV) = '$Rev: 352 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => '$Date: 2009-01-08 13:46:50 -0800 (Thu, 08 Jan 2009) $',
+    changed => '$Date: 2009-01-21 09:50:42 -0800 (Wed, 21 Jan 2009) $',
 );
 
 my $window;
@@ -41,14 +34,29 @@ my %friends;
 my $last_poll = time - 300;
 my %tweet_cache;
 my %id_map;
+my %irssi_to_mirc_colors = (
+    '%k'    => '01',
+    '%r'    => '05',
+    '%g'    => '03',
+    '%y'    => '07',
+    '%b'    => '02',
+    '%m'    => '06',
+    '%c'    => '10',
+    '%w'    => '15',
+    '%K'    => '14',
+    '%R'    => '04',
+    '%G'    => '09',
+    '%Y'    => '08',
+    '%B'    => '12',
+    '%M'    => '13',
+    '%C'    => '11',
+    '%W'    => '00',
+);
 
 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 ) {
@@ -62,10 +70,7 @@ sub cmd_direct {
 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 ) {
@@ -73,10 +78,7 @@ sub cmd_direct_as {
         return;
     }
 
-    unless ( exists $twits{$username} ) {
-        &notice("Unknown username $username");
-        return;
-    }
+    return unless &valid_username($username);
 
     eval {
         unless ( $twits{$username}
@@ -99,10 +101,7 @@ sub cmd_direct_as {
 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) {
@@ -116,10 +115,7 @@ sub cmd_tweet {
 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;
@@ -129,10 +125,7 @@ sub cmd_tweet_as {
         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 ) {
@@ -143,11 +136,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) )
@@ -166,21 +155,7 @@ sub cmd_tweet_as {
         $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)" : "" ) );
 }
@@ -188,10 +163,7 @@ sub cmd_tweet_as {
 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) {
@@ -219,10 +191,7 @@ sub cmd_reply_as {
         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;
@@ -232,10 +201,7 @@ sub cmd_reply_as {
         return;
     }
 
-    unless ( exists $twits{$username} ) {
-        &notice("Unknown username $username");
-        return;
-    }
+    return unless &valid_username($username);
 
     my $nick;
     $id =~ s/[^\w\d\-:]+//g;
@@ -264,11 +230,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 (
@@ -294,21 +256,7 @@ sub cmd_reply_as {
         $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)" : "" ) );
 }
@@ -319,10 +267,7 @@ sub gen_cmd {
     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) {
@@ -364,12 +309,12 @@ sub cmd_logout {
     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};
-    } elsif ($data) {
-        &notice("Unknown username '$data'");
     } else {
         &notice("Logging out $user...");
         $twit->end_session();
@@ -605,10 +550,8 @@ sub get_updates {
               . 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();
@@ -672,8 +615,11 @@ sub do_updates {
 
     unless ( ref $tweets ) {
         if ( $obj->can("get_error") ) {
+            my $error;
+            eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
+            if ($@) { $error = $obj->get_error() }
             print $fh "type:debug API Error during friends_timeline call: ",
-              JSON::Any->jsonToObj( $obj->get_error() ), "  Aborted.\n";
+              "$error  Aborted.\n";
         } else {
             print $fh
               "type:debug API Error during friends_timeline call. Aborted.\n";
@@ -683,8 +629,8 @@ sub do_updates {
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
-        $text =~ s/%/%%/g;
-        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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
@@ -694,13 +640,13 @@ sub do_updates {
             $nicks{ $t->{in_reply_to_screen_name} } = time;
             my $context;
             eval {
-              $context = $obj->show_status( $t->{in_reply_to_status_id} );
+                $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;
+                $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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;
@@ -708,7 +654,8 @@ sub do_updates {
             } elsif ($@) {
                 print $fh "type:debug request to get context failed: $@";
             } else {
-                print $fh "type:debug 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;
             }
         }
@@ -735,8 +682,8 @@ sub do_updates {
           if exists $friends{ $t->{user}{screen_name} };
 
         my $text = decode_entities( $t->{text} );
-        $text =~ s/%/%%/g;
-        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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;
     }
@@ -755,8 +702,8 @@ sub do_updates {
 
     foreach my $t ( reverse @$tweets ) {
         my $text = decode_entities( $t->{text} );
-        $text =~ s/%/%%/g;
-        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/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;
     }
@@ -778,6 +725,7 @@ sub monitor_child {
         while (<FILE>) {
             chomp;
             last if /^__friends__/;
+            my $hilight = 0;
             my %meta;
             foreach my $key (qw/id account nick type/) {
                 if (s/^$key:(\S+)\s*//) {
@@ -804,14 +752,20 @@ sub monitor_child {
                 $marker                            = ":$marker";
             }
 
+            my $hilight_color = $irssi_to_mirc_colors{Irssi::settings_get_str("hilight_color")};
+            if ( $_ =~ /\@($meta{account})\W/ ) {
+                $meta{nick} = "\cC$hilight_color$meta{nick}\cO";
+                $hilight = MSGLEVEL_HILIGHT;
+            }
+
             if ( $meta{type} eq 'tweet' ) {
-                push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
+                push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_];
             } elsif ( $meta{type} eq 'reply' ) {
-                push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
+                push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_];
             } elsif ( $meta{type} eq 'dm' ) {
-                push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
+                push @lines, [(MSGLEVEL_MSGS | $hilight), $meta{type}, $account, $meta{nick}, $_];
             } elsif ( $meta{type} eq 'error' ) {
-                push @lines, "ERROR: $_\n";
+                push @lines, [MSGLEVEL_MSGS, $_];
             } elsif ( $meta{type} eq 'debug' ) {
                 print "$_" if &debug,;
             } else {
@@ -831,12 +785,9 @@ sub monitor_child {
 
         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 ( $line =~ /\@([-\w]+)/ ) {
-                    $nicks{$1} = time;
-                }
+            for my $line ( @lines ) {
+                $window->printformat(@$line[0], "twirssi_".@$line[1],
+                  @$line[2,3,4,5]);
             }
 
             close FILE;
@@ -886,6 +837,61 @@ sub notice {
     $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 ) = @_;
 
@@ -895,7 +901,9 @@ sub sig_complete {
             and $linestart =~ /^\/reply(?:_as)?\s*$/ )
       )
     {    # /twitter_reply gets a nick:num
-        @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
+        $word =~ s/^@//;
+        @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i,
+          sort keys %{ $id_map{__indexes} };
     }
 
     # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
@@ -909,6 +917,28 @@ sub sig_complete {
     }
 }
 
+sub event_send_text {
+    my ( $line, $server, $win ) = @_;
+    my $awin = Irssi::active_win();
+
+    # if the window where we got our text was the twitter window, and the user
+    # wants to be lazy, tweet away!
+    if ( ( $awin->get_active_name() eq $window->{name} )
+        and Irssi::settings_get_bool("tweet_window_input") )
+    {
+        &cmd_tweet( $line, $server, $win );
+    }
+}
+
+Irssi::signal_add( "send text", "event_send_text" );
+
+Irssi::theme_register([
+    'twirssi_tweet', '[$0%B@$1%n$2] $3',
+    'twirssi_reply', '[$0\--> %B@$1%n$2] $3',
+    'twirssi_dm',    '[$0%B@$1%n (%WDM%n)] $2',
+    'twirssi_error', 'ERROR: $0',
+]);
+
 Irssi::settings_add_str( "twirssi", "twitter_window",     "twitter" );
 Irssi::settings_add_str( "twirssi", "bitlbee_server",     "bitlbee" );
 Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
@@ -925,8 +955,14 @@ Irssi::settings_add_bool( "twirssi", "twirssi_debug",             0 );
 Irssi::settings_add_bool( "twirssi", "twirssi_first_run",         1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_track_replies",     1 );
 Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
+Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 
+if (!$window) {
+  $window = Irssi::Windowitem::window_create (Irssi::settings_get_str('twitter_window'), 1);
+  $window->set_name (Irssi::settings_get_str('twitter_window'));
+}
+
 if ($window) {
     Irssi::command_bind( "dm",               "cmd_direct" );
     Irssi::command_bind( "dm_as",            "cmd_direct_as" );
@@ -1028,3 +1064,4 @@ if ($window) {
           . " or change the value of twitter_window.  Then, reload twirssi." );
 }
 
+# vim: set sts=4 expandtab: