X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/blobdiff_plain/77ff80bc4cf6b780b63a41a7ce261546c571d00a..714d0806bba11bade31e514170d247c4aa8cce81:/twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index 444aac6..4decda6 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -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 ) = @_;
@@ -707,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*//) {
@@ -733,17 +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' ) {
-                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_tweet',
-                  $account, $meta{nick}, $marker, $_);
+                push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_];
             } elsif ( $meta{type} eq 'reply' ) {
-                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_reply',
-                  $account, $meta{nick}, $marker, $_);
+                push @lines, [(MSGLEVEL_PUBLIC | $hilight), $meta{type}, $account, $meta{nick}, $marker, $_];
             } elsif ( $meta{type} eq 'dm' ) {
-                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_dm',
-                  $account, $meta{nick}, $_);
+                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 {
@@ -763,6 +785,10 @@ sub monitor_child {
 
         if ($new_last_poll) {
             print "new last_poll = $new_last_poll" if &debug;
+            for my $line ( @lines ) {
+                $window->printformat(@$line[0], "twirssi_".@$line[1],
+                  @$line[2,3,4,5]);
+            }
 
             close FILE;
             unlink $filename
@@ -910,6 +936,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" );