Merge branch 'master' into bss

diff --git a/twirssi.pl b/twirssi.pl
index aaf0bd124dfc7299ad7b9a20c6feb39f6a6e8df9..43aba359084975946723705ece1643a9be369551 100644 (file)
--- 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 ) = @_;
@@ -611,8 +629,7 @@ 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")
@@ -628,8 +645,7 @@ sub do_updates {
 
             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,
@@ -666,8 +682,7 @@ 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;
@@ -687,8 +702,7 @@ 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;
@@ -711,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*//) {
@@ -737,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 {
@@ -764,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;
@@ -915,6 +933,13 @@ sub event_send_text {
 
 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" );
@@ -1042,3 +1067,4 @@ if ($window) {
           . " or change the value of twitter_window.  Then, reload twirssi." );
 }
 
+# vim: set sts=4 expandtab: