Changeset 840

Timestamp:

10/29/07 19:33:12 (13 months ago)

Author:

tokuhirom

Message:

lang/perl/mobirc: colorize nick. my nick and other's nick have different color ;-)

Location:

lang/perl/mobirc/trunk/mobirc

Files:

• assets/tmpl/include/header.html (modified) (1 diff)
• lib/Mobirc/HTTPD/Controller.pm (modified) (1 diff)
• t/02-render_line.t (modified) (2 diffs)

lang/perl/mobirc/trunk/mobirc/assets/tmpl/include/header.html

@@ -33 +33 @@
         color: #fc4efe;
     }
+    .nick_normal { color: #000080; }
+    .nick_myself { color: #6060a0; }
 </style>
 

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD/Controller.pm

@@ -265 +265 @@
     $src = decorate_irc_color($src);
 
-    $src =~ s!^\*([a-z_]+)\*(\d+):(\d+)\s*(.+)$!<span class="time"><span class="hour">$2</span><span class="colon">:</span><span class="minute">$3</span></span> <span class="$1">$4</span>!;
+    $src =~ s{^\*([a-z_]+)\*(\d+):(\d+)\s*(.+)$}{
+        my ($class, $hour, $minute, $body) = ($1, $2, $3, $4);
+
+        if ($class eq 'notice' || $class eq 'public') {
+            $body =~ s!^([^&]+)&gt; (.+)$!sprintf "<span class='%s'>$1</span>&gt; $2", ($1 eq $c->{irc_heap}->{irc}->nick_name) ? 'nick_myself' : 'nick_normal'!e;
+        }
+
+        my $res = qq!<span class="time"><span class="hour">$hour</span><span class="colon">:</span><span class="minute">$minute</span></span>!;
+           $res .= " ";
+           $res .= qq!<span class="$class">$body</span>!;
+           $res;
+    }e;
 
     return $src;

lang/perl/mobirc/trunk/mobirc/t/02-render_line.t

@@ -7 +7 @@
 plan tests => 1*blocks;
 
+{
+    package PoCoIRCMock;
+    sub nick_name { 'tokuhirom' }
+}
+
 sub render_line {
     my $src = shift;
-    return Mobirc::HTTPD::Controller::render_line({}, $src);
+    my $irc = bless {}, 'PoCoIRCMock';
+    return Mobirc::HTTPD::Controller::render_line({irc_heap => {irc => $irc }}, $src);
 }
 
@@ -22 +28 @@
 === basic
 --- input: *public*02:12 Y*ppo__> uh*aww
---- expected: <span class="time"><span class="hour">02</span><span class="colon">:</span><span class="minute">12</span></span> <span class="public">Y*ppo__&gt; uh*aww</span>
+--- expected: <span class="time"><span class="hour">02</span><span class="colon">:</span><span class="minute">12</span></span> <span class="public"><span class='nick_normal'>Y*ppo__</span>&gt; uh*aww</span>
+
+=== mine
+--- input: *public*02:12 tokuhirom> uh*aww
+--- expected: <span class="time"><span class="hour">02</span><span class="colon">:</span><span class="minute">12</span></span> <span class="public"><span class='nick_myself'>tokuhirom</span>&gt; uh*aww</span>
 
 === under score