X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/2cbdec5357caa3a57ae4fee320a8da2e420d2d4f..ee0c503ce407c794199a9d00662aecb076d652dd:/twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index edb207e..43aba35 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -11,8 +11,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "1.7.6";
-my ($REV) = '$Rev: 379 $' =~ /(\d+)/;
+$VERSION = "1.7.7";
+my ($REV) = '$Rev: 422 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 379 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => '$Date: 2009-01-21 09:50:42 -0800 (Wed, 21 Jan 2009) $',
+    changed => '$Date: 2009-01-26 08:19:42 -0800 (Mon, 26 Jan 2009) $',
 );
 
 my $window;
@@ -34,6 +34,24 @@ 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 ) = @_;
@@ -109,7 +127,7 @@ sub cmd_tweet_as {
 
     return unless &valid_username($username);
 
-    if ( Irssi::settings_get_str("short_url_provider") ) {
+    if ( &too_long($data) and Irssi::settings_get_str("short_url_provider") ) {
         foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) {
             eval {
                 my $short = makeashorterlink($url);
@@ -734,7 +752,9 @@ sub monitor_child {
                 $marker                            = ":$marker";
             }
 
-            if ( $_ =~ /\@$meta{account}\W/ ) {
+            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;
             }
 
@@ -745,7 +765,7 @@ sub monitor_child {
             } elsif ( $meta{type} eq 'dm' ) {
                 push @lines, [(MSGLEVEL_MSGS | $hilight), $meta{type}, $account, $meta{nick}, $_];
             } elsif ( $meta{type} eq 'error' ) {
-                $window->print("ERROR: $_", MSGLEVEL_PUBLIC);
+                push @lines, [MSGLEVEL_MSGS, $_];
             } elsif ( $meta{type} eq 'debug' ) {
                 print "$_" if &debug,;
             } else {
@@ -840,11 +860,12 @@ sub update_away {
 }
 
 sub too_long {
-    my $data = shift;
+    my $data    = shift;
+    my $noalert = shift;
 
     if ( length $data > 140 ) {
-        &notice(
-            "Tweet too long (" . length($data) . " characters) - aborted" );
+        &notice( "Tweet too long (" . length($data) . " characters) - aborted" )
+          unless $noalert;
         return 1;
     }
 
@@ -916,6 +937,7 @@ 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" );
@@ -935,11 +957,13 @@ 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'));
+$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) {