--- deliantra/server/ext/chat.ext	2007/07/22 17:10:05	1.23
+++ deliantra/server/ext/chat.ext	2008/12/18 02:49:22	1.46
@@ -1,25 +1,28 @@
-#! perl # depends=irc
-#CONVERSION: PARTIAL
+#! perl # depends=irc mandatory
 
-# implement a replacement for the built-in say/chat/shout/tell/reply commands
+# implement a replacement for the built-in say/chat/shout/tell commands
 # adds ignore/unignore functionality
 
 use NPC_Dialogue;
 use POSIX (); # for strftime only
 
-our $SAY_CHANNEL = {
-   id      => "say",
-   title   => "Map",
-   reply   => "say ",
-   tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
-};
+sub tell_channel($) {
+   my ($target) = @_;
 
-our $CHAT_CHANNEL = {
-   id      => "chat",
-   title   => "Chat",
-   reply   => "chat ",
-   tooltip => "Player chat and shouts, global to the server.",
-};
+   {
+      id      => "tell-$target",
+      title   => "$target",
+      reply   => "tell $target ",
+      tooltip => "Private messages from/to $target",
+   }
+}
+
+sub send_msg($$$$$) {
+   my ($pl, $channel, $msg, $flags, $sound) = @_;
+   $pl->play_sound (cf::sound::find $sound) if defined $sound;
+   $pl->send_msg ($channel, $msg, $flags);
+   ()
+}
 
 sub clean_timeouts($) {
    my ($player) = @_;
@@ -28,10 +31,10 @@
    for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) {
       while (my ($k, $v) = each %$hash) {
          if ($v < $NOW) {
-            $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN | cf::NDI_UNIQUE);
+            $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN);
             delete $hash->{$k};
          } elsif (!cf::player::exists $k) {
-            $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN | cf::NDI_UNIQUE);
+            $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN);
             delete $hash->{$k};
          }
       }
@@ -53,62 +56,47 @@
    on_login => sub {
       my ($pl) = @_;
 
-      clean_timeouts $pl->ob;
-      $pl->ns->send_msg ($SAY_CHANNEL);
-      $pl->ns->send_msg ($CHAT_CHANNEL);
+      cf::async {
+         clean_timeouts $pl->ob;
+      };
+
+      $pl->send_msg ($cf::SAY_CHANNEL);
+      $pl->send_msg ($cf::CHAT_CHANNEL);
    },
 );
 
+# TODO: remove once safe
 cf::register_command listen => sub {
-   my ($pl, $msg) = @_;
-   my $player = cf::player::find_active $pl->name;
-
-   if ($msg ne "") {
-      $msg = 10 if $msg > 10;
-
-      my $prev_listen = $player->listening;
-      $player->listening ($msg);
-      if ($prev_listen == $player->listening) {
-         $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_UNIQUE);
-      } else {
-         $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
-      }
-   } else {
-      $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
-   }
 };
 
 cf::register_command cointoss => sub {
-   my ($pl, $msg) = @_;
+   my ($ob, $msg) = @_;
+
+   my $pl = $ob->contr;
+   my $name = $ob->name;
 
-   my $name = $pl->name;
    my $coin = int rand 2 ? "Heads" : "Tails";
 
-   for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
-      next
-         if $other->ob == $pl;
-      $other->ob->message ("$name flips a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE);
-   }
+   send_msg $_, $cf::SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
+      for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
    
-   $pl->message ("You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE);
+   $pl->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
 };
 
 cf::register_command orcknuckle => sub {
-   my ($pl, $msg) = @_;
-   my @orcknuckle =  ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc");
+   my ($ob, $msg) = @_;
 
-   my $name = $pl->name;
+   my $pl = $ob->contr;
+   my $name = $ob->name;
 
-   my ($i, $j, $k, $l) = ((int rand 5) + 1, (int rand 5) + 1, (int rand 5) + 1, (int rand 6) + 1);
+   my @orcknuckle =  ("beholder", "ghost", "knight", "princess", "dragon", "orc");
+   my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
    my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
 
-   for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
-      next
-         if $other->ob == $pl;
-      $other->ob->message ("$name rolls $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
-   }
-      
-   $pl->message ("You roll $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
+   send_msg $_, $cf::SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
+      for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
+   
+   $pl->send_msg ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
 };
 
 my $emotes = {
@@ -164,7 +152,7 @@
    },
    scream => {
       noparams => {
-         other => "<self> screams at the top of his lungs!",
+         other => "<self> screams at the top of G<his|her> lungs!",
          self => "ARRRRRRRRRRGH!!!!!",
       },
       params => {
@@ -183,7 +171,7 @@
          self => "You puke on <other>.",
       },
       self => {
-         other => "<self> pukes on his clothes.",
+         other => "<self> pukes on G<his|her> clothes.",
          self => "You puke on yourself.",
       },
    },
@@ -242,6 +230,19 @@
       self => {
       },
    },
+   smother => {
+      noparams => {
+         other => "<self> makes weird facial contortions",
+         self => "All the lonely people..",
+      },
+      params => {
+         target => "<self> smothers you with kisses.",
+         other => "<self> smothers <other> with kisses.",
+         self => "You smother <other> with kisses.",
+      },
+      self => {
+      },
+   },
    wink => {
       noparams => {
          other => "<self> winks suggestively.",
@@ -253,7 +254,7 @@
          self => "You wink suggestively at <other>.",
       },
       self => {
-         other => "<self> winks at himself - something strange is going on...",
+         other => "<self> winks at G<him|her>self - something strange is going on...",
          self => "You wink at yourself?? What are you up to?",
       },
    },
@@ -269,7 +270,7 @@
    },
    cackle => {
       noparams => {
-         other => "<self> throws back his head and cackles with insane glee!",
+         other => "<self> throws back G<his|her> head and cackles with insane glee!",
          self => "You cackle gleefully.",
       },
       params => {
@@ -288,7 +289,7 @@
          self => "You sniff <other>.",
       },
       self => {
-         other => "<self> sniffs himself.",
+         other => "<self> sniffs G<him|her>self.",
          self => "You sniff yourself.",
       },
    },
@@ -298,9 +299,9 @@
          self => "You nod solemnly.",
       },
       params => {
-         target => "<self> nods solemnly to you.",
-         other => "<self> nods solemnly to <other>.",
-         self => "You nod solemnly to <other>.",
+         target => "<self> nods solemnly at you.",
+         other => "<self> nods solemnly at <other>.",
+         self => "You nod solemnly at <other>.",
       },
       self => {
       },
@@ -316,7 +317,7 @@
          self => "You frown darkly at <other>.",
       },
       self => {
-         other => "<self> frowns at himself.",
+         other => "<self> frowns at G<him|her>self.",
          self => "You frown at yourself.",
       },
    },
@@ -349,18 +350,18 @@
          self => "You bleed all over your nice new armour.",
       },
       params => {
-         target => "<self> slashes his wrist and bleeds all over you.",
-         other => "<self> slashes his wrist and bleeds all over <other>.",
+         target => "<self> slashes G<his|her> wrist and bleeds all over you.",
+         other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
          self => "You slash your wrist and bleed all over <other>",
       },
       self => {
-         other => "<self> performs some satanic ritual while wiping his blood on himself.",
+         other => "<self> performs some satanic ritual while wiping G<his|her> blood on G<him|her>self.",
          self => "Very impressive! You wipe your blood all over yourself.",
       },
    },
    twiddle => {
       noparams => {
-         other => "<self> patiently twiddles his thumbs.",
+         other => "<self> patiently twiddles G<his|her> thumbs.",
          self => "You patiently twiddle your thumbs.",
       },
       params => {
@@ -370,7 +371,7 @@
    },
    spit => {
       noparams => {
-         other => "<self> spits over his left shoulder.",
+         other => "<self> spits over G<his|her> left shoulder.",
          self => "You spit over your left shoulder.",
       },
       params => {
@@ -379,13 +380,13 @@
          self => "You spit on <other>.",
       },
       self => {
-         other => "<self> drools all over himself.",
+         other => "<self> drools all over G<him|her>self.",
          self => "You drool all over yourself.",
       },
    },
    glare => {
       noparams => {
-         other => "<self> glares around him.",
+         other => "<self> glares around G<him|her>.",
          self => "You glare at nothing in particular.",
       },
       params => {
@@ -394,7 +395,7 @@
          self => "You glare icily at <other>.",
       },
       self => {
-         other => "<self> glares at his feet, what is bothering him?",
+         other => "<self> glares at G<his|her> feet, what is bothering G<him|her>?",
          self => "You glare icily at your feet, they are suddenly very cold.",
       },
    },
@@ -409,13 +410,13 @@
          self => "You bow before <other>.",
       },
       self => {
-         other => "<self> folds up like a jackknife and kisses his own toes.",
+         other => "<self> folds up like a jackknife and kisses G<his|her> own toes.",
          self => "You kiss your toes.",
       },
    },
    dance => {
       noparams => {
-         other => "<self> expresses himself through interpretive dance.",
+         other => "<self> expresses G<him|her>self through interpretive dance.",
          self => "You dance with glee.",
       },
       params => {
@@ -424,7 +425,7 @@
          self => "You grab <other> and begin doing the Cha-Cha!",
       },
       self => {
-         other => "<self> embraces himself and begins to dance!",
+         other => "<self> embraces G<him|her>self and begins to dance!",
          self => "You skip and dance around by yourself.",
       },
    },
@@ -450,7 +451,7 @@
    },
    snap => {
       noparams => {
-         other => "<self> snaps his fingers.",
+         other => "<self> snaps G<his|her> fingers.",
          self => "PRONTO! you snap your fingers.",
       },
       params => {
@@ -469,7 +470,7 @@
          self => "You wave goodbye to <other>.",
       },
       self => {
-         other => "<self> waves goodbye to himself.",
+         other => "<self> waves goodbye to G<him|her>self.",
          self => "Are you going on adventures as well??",
       },
    },
@@ -493,11 +494,11 @@
       },
       params => {
          target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.",
-         other => "<self> sneezes on <other> and a film of snot covers him.",
-         self => "You sneeze at <other> and a film of snot shoots onto him.",
+         other => "<self> sneezes on <other> and a film of snot covers G<him|her>.",
+         self => "You sneeze at <other> and a film of snot shoots onto G<him|her>.",
       },
       self => {
-         other => "<self> sneezes, and covers himself in a slimy substance.",
+         other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
          self => "You sneeze on yourself, what a mess!",
       },
    },
@@ -516,7 +517,7 @@
    },
    shake => {
       noparams => {
-         other => "<self> shakes his head.",
+         other => "<self> shakes G<his|her> head.",
          self => "You shake your head.",
       },
       params => {
@@ -531,7 +532,7 @@
    },
    lick => {
       noparams => {
-         other => "<self> licks his mouth and smiles.",
+         other => "<self> licks G<his|her> mouth and smiles.",
          self => "You lick your mouth and smile.",
       },
       params => {
@@ -540,7 +541,7 @@
          self => "You lick <other>.",
       },
       self => {
-         other => "<self> licks himself - YUCK.",
+         other => "<self> licks G<him|her>self - YUCK.",
          self => "You lick yourself.",
       },
    },
@@ -556,7 +557,7 @@
    },
    think => {
       noparams => {
-         other => "<self> closes his eyes and thinks really hard.",
+         other => "<self> closes G<his|her> eyes and thinks really hard.",
          self => "Anything in particular that you'd care to think about?",
       },
       params => {
@@ -630,7 +631,7 @@
          self => "You cry on <other>'s shoulder.",
       },
       self => {
-         other => "<self> sobs quietly to himself.",
+         other => "<self> sobs quietly to G<him|her>self.",
          self => "You cry to yourself.",
       },
    },
@@ -654,7 +655,7 @@
          self => "You whistle at <other>.",
       },
       self => {
-         other => "<self> whistles to himself in boredom.",
+         other => "<self> whistles to G<him|her>self in boredom.",
          self => "You whistle while you work.",
       },
    },
@@ -695,70 +696,67 @@
 
 for my $emotion (keys %$emotes) {
    cf::register_command $emotion => sub {
-      my ($pl, $tname) = @_;
+      my ($ob, $tname) = @_;
+
+      my $pl = $ob->contr;
       
       cf::async {
-         my $name = $pl->name;
+         my $name = $ob->name;
+         $Coro::current->{desc} = "emote handler for $name";
          
          if ($tname eq $name) {
-            my $emote = $emotes->{$emotion}->{self};
+            my %emote = %{ $emotes->{$emotion}->{self} || {} };
+
+            $emote{other} ||= "You look away from <self>.";
+            $emote{self}  ||= "My god! Is that LEGAL?";
 
-            $emote->{other} = "You look away from <self>."
-               if !$emote->{other};
-            $emote->{self} = "My god! Is that LEGAL?"
-               if !$emote->{self};
+            $emote{other} =~ s/<self>/$name/;
 
-            $emote->{other} =~ s/<self>/$name/;
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
             
-            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $pl;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
+               for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
 
-            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          } elsif ($tname) {
             my $target = cf::player::find $tname
-               or return $pl->reply (undef, "$tname is not around.");
+               or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
             
-            my $emote = $emotes->{$emotion}->{params};
+            my %emote = %{ $emotes->{$emotion}->{params} || {} };
 
-            $emote->{other} = "<self> is eyeing <other> quizzically."
-               if !$emote->{other};
-            $emote->{self} = "You are still nuts."
-               if !$emote->{self};
-            $emote->{target} = "You get the distinct feeling that <other> is nuts."
-               if !$emote->{target};
-
-            $emote->{self} =~ s/<other>/$tname/;
-            $emote->{target} =~ s/<self>/$name/;
-            $emote->{other} =~ s/<other>/$tname/;
-            $emote->{other} =~ s/<self>/$name/;
+            $emote{other}  ||= "<self> is eyeing <other> quizzically.";
+            $emote{self}   ||= "You are still nuts.";
+            $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
+
+            $emote{self}   =~ s/<other>/$tname/;
+            $emote{target} =~ s/<self>/$name/;
+            $emote{other}  =~ s/<other>/$tname/;
+            $emote{other}  =~ s/<self>/$name/;
             
-            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $pl or $other == $target;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
+
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
+               for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
 
-            $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
+            $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          } else {
-            my $emote = $emotes->{$emotion}->{noparams};
-            $emote->{other} =~ s/<self>/$name/;
+            my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
 
-            $emote->{other} = "<self> dances with glee."
-               if !$emote->{other};
-            $emote->{self} = "You are a nut."
-               if !$emote->{self};
+            $emote{other} ||= "<self> dances with glee.";
+            $emote{self}  ||= "You are a nut.";
             
-            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $pl;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            $emote{other} =~ s/<self>/$name/;
+
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
+
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
+               for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
 
-            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          }
       };
    };
@@ -769,7 +767,7 @@
    
    my $name = $pl->name;
    
-   $_->ns->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY, $_ == $pl ? (reply => 1) : ())
+   send_msg $_, $cf::SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
       for grep $pl->on_same_map_as ($_->ob), cf::player::list;
 };
 
@@ -784,8 +782,9 @@
       my $name = $ob->name;
       my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
 
-      $_->ns->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, $_ == $ob ? (reply => 1) : ())
-         for @plonmap;
+      send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
+         for grep $_ != $ob->contr, @plonmap;
+      $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
 
       # npcs, magic_ears etc.
       # first find all objects and their first-level inventories
@@ -794,7 +793,7 @@
       my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
 
       for my $npc (
-         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
+         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || $_->has_dialogue,
             map +($_, $_->inv),
                grep $_,
                   map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
@@ -808,71 +807,70 @@
 
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
-               if (length $reply) {
-                  $_->ns->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN)
-                     for @plonmap;
-               }
-               $npc->use_trigger;
+               send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
+                  for @plonmap;
             } else {
-               if (length $reply) {
-                  $_->ns->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN)
-                     for @plonmap;
-               }
+               send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
+                  for @plonmap;
             }
          }
 
          if (@kw) {
-            $_->ns->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
+            $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
                for @plonmap;
          }
       }
 
    } else {
-      $ob->contr->send_msg ($SAY_CHANNEL => "What do you want to say?", 0, reply => 1);
+      $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
    }
 };
 
 cf::register_command chat => sub {
-   my ($pl, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
+   my $pl = $ob->contr;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
 
    if ($msg) {
-      my $name = $pl->name;
+      my $name = $ob->name;
       my $NOW = time;
 
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
       send_irc ("[%s] %s", $name, $msg);
 
-      $_->ns->send_msg ($CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE, $_ == $pl ? (reply => 1) : ())
-         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
+      send_msg $_, $cf::CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
+         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
 
    } else {
-      $pl->ns->send_msg ($CHAT_CHANNEL => "Chat what?");
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
    }
 };
 
 cf::register_command shout => sub {
-   my ($pl, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
+   my $pl = $ob->contr;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
 
    if ($msg) {
       my $NOW = time;
-      my $name = $pl->name;
+      my $name = $ob->name;
 
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
       send_irc ("\007\0034{%s} %s\n", $name, $msg);
 
-      $_->ns->send_msg ($CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_BLUE, $_ == $pl ? (reply => 1) : ())
-         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
+      send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
+         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
 
    } else {
-      $pl->ns->send_msg ($CHAT_CHANNEL => "Shout what?");
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
    }
 };
 
@@ -889,43 +887,34 @@
 
    return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
 
-   my $pl_channel = {
-      id      => "tell-$target",
-      title   => "$target",
-      reply   => "tell $target ",
-      tooltip => "Private messages from/to $target",
-   };
+   my $pl_channel = tell_channel $target;
 
    if ($target =~ /irc\//) {
       my (undef, $nick) = split /\//, $target, 2;
-      $ns->send_msg ($pl_channel => "You tell $target: $args", reply => 1);
+      $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
       send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
+
    } elsif (my $other = cf::player::find_active $target) {
-      my $other_channel = {
-         id      => "tell-$name",
-         title   => "$name",
-         reply   => "tell $name ",
-         tooltip => "Private messages from/to $name",
-      };
+      my $other_channel = tell_channel $name;
 
       if ($msg) {
          if ($target eq $name) {
-            $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", reply => 1);
+            $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
          } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
-            $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", reply => 1);
+            $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
          } else {
-            return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg);
+            return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
 
-            $ns->send_msg ($pl_channel => "You tell $target: $msg", reply => 1);
-            $other->ns->send_msg ($other_channel => "$name tells you: $msg");
+            $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
+            send_msg $other, $other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF, "msg_tell";
          }
       } else {
-         $ns->send_msg ($pl_channel => "What do you want to tell $target?");
+         $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
       }
 
    } else {
-      $ns->send_msg ($pl_channel => "No such player. Your message: $msg");
+      $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
    }
 };
 
@@ -933,82 +922,85 @@
    my ($pl, $args) = @_;
    my ($target, $type, $timeout) = split /\s+/, $args;
 
-   if ($args eq "list") {
-      clean_timeouts $pl;
-
-      if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
-          + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
-         $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
-         $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
-         $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
-      } else {
-         $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
-      }
-
-   } elsif ($target && $type) {
-
-      $timeout ne "" or $timeout = 24;
-      my $absolute_timeout = time + $timeout * 3600;
-
-      if (cf::player::exists $target) {
-         if ($type eq "tell") {
-            $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
-         } elsif ($type eq "shout") {
-            $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
-         } elsif ($type eq "all") {
-            $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
-            $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
+   cf::async {
+      if ($args eq "list") {
+         clean_timeouts $pl;
+
+         if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
+             + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
+            $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
+            $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
+            $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
+            $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
+            $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
          } else {
-            $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
          }
+
+      } elsif ($target && $type) {
+            $timeout ne "" or $timeout = 24;
+            my $absolute_timeout = time + $timeout * 3600;
+
+            if (cf::player::exists $target) {
+               if ($type eq "tell") {
+                  $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
+                  $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
+               } elsif ($type eq "shout") {
+                  $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
+                  $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
+               } elsif ($type eq "all") {
+                  $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
+                  $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
+                  $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
+               } else {
+                  $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
+               }
+            } else {
+               $pl->message ("No such player: $target", cf::NDI_REPLY);
+            }
+
       } else {
-         $pl->message ("No such player: $target", cf::NDI_UNIQUE);
+         $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
+                      . "will ignore a player for <timeout> hours.\n"
+                      . "Usage: ignore list\n"
+                      . "will show you a list of players currently ignored.", cf::NDI_REPLY);
       }
-
-   } else {
-      $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
-                   . "will ignore a player for <timeout> hours.\n"
-                   . "Usage: ignore list\n"
-                   . "will show you a list of players currently ignored.", cf::NDI_UNIQUE);
-   }
+   };
 };
 
 cf::register_command unignore => sub {
    my ($pl, $args) = @_;
    my ($target, $type) = split /\s+/, $args;
 
-   if ($args eq "") {
-      if ($pl->{ext_ignore_tell}) {
-         $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE);
-         $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE);
-      } else {
-         $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
-      }
-   } else {
-      if (cf::player::exists $target) {
-         if ($type eq "tell") {
-            $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
-            delete $pl->{ext_ignore_tell} {$target};
-         } elsif ($type eq "shout") {
-            $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
-            delete $pl->{ext_ignore_shout}{$target};
-         } elsif ($type eq "all") {
-            $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
-            delete $pl->{ext_ignore_tell} {$target};
-            delete $pl->{ext_ignore_shout}{$target};
+   cf::async {
+      if ($args eq "") {
+         if ($pl->{ext_ignore_tell}) {
+            $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
+            $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
+            $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
+            $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
          } else {
-            $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
          }
       } else {
-         $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE);
+         if (cf::player::exists $target) {
+            if ($type eq "tell") {
+               $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
+               delete $pl->{ext_ignore_tell} {$target};
+            } elsif ($type eq "shout") {
+               $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
+               delete $pl->{ext_ignore_shout}{$target};
+            } elsif ($type eq "all") {
+               $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
+               delete $pl->{ext_ignore_tell} {$target};
+               delete $pl->{ext_ignore_shout}{$target};
+            } else {
+               $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
+            }
+         } else {
+            $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
+         }
       }
-   }
+   };
 };