--- deliantra/server/ext/chat.ext	2007/02/28 19:32:56	1.7
+++ deliantra/server/ext/chat.ext	2008/08/29 02:07:09	1.42
@@ -1,12 +1,29 @@
-#! perl
-#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
 
+sub tell_channel($) {
+   my ($target) = @_;
+
+   {
+      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) = @_;
    my $NOW = time;
@@ -14,44 +31,70 @@
    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};
          }
       }
    }
 }
 
+# send_irc ($format, @args, $msg)
+# make sure the last argument is the message!
+sub send_irc {
+   my ($format, @args) = @_;
+   my $msg = pop @args;
+   for (split /\n/, $msg) {
+      ext::irc::do_notice (sprintf $format, @args, $_)
+   }
+}
+
 cf::player->attach (
    prio     => -1000,
    on_login => sub {
       my ($pl) = @_;
 
       clean_timeouts $pl->ob;
-   },
 
-   1
+      $pl->send_msg ($cf::SAY_CHANNEL);
+      $pl->send_msg ($cf::CHAT_CHANNEL);
+   },
 );
 
+# TODO: remove once safe
 cf::register_command listen => sub {
-   my ($who, $msg) = @_;
-   my $player = cf::player::find_active $who->name;
+};
 
-   if ($msg ne "") {
-      my $prev_listen = $player->listening;
-      $player->listening ($msg);
-      if ($prev_listen == $player->listening) {
-         $who->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE);
-      } else {
-         $who->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
-      }
-   } else {
-      $who->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
-   }
+cf::register_command cointoss => sub {
+   my ($ob, $msg) = @_;
+
+   my $pl = $ob->contr;
+   my $name = $ob->name;
+
+   my $coin = int rand 2 ? "Heads" : "Tails";
 
-   1
+   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->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
+};
+
+cf::register_command orcknuckle => sub {
+   my ($ob, $msg) = @_;
+
+   my $pl = $ob->contr;
+   my $name = $ob->name;
+
+   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]";
+
+   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 = {
@@ -185,13 +228,27 @@
       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.",
          self => "Have you got something in your eye?",
       },
       params => {
-         target => "<self> winks at <other>.",
+         target => "<self> winks at you.",
+         other => "<self> winks at <other>.",
          self => "You wink suggestively at <other>.",
       },
       self => {
@@ -291,7 +348,8 @@
          self => "You bleed all over your nice new armour.",
       },
       params => {
-         target => "<self> slashes his wrist and bleeds all over <other>.",
+         target => "<self> slashes his wrist and bleeds all over you.",
+         other => "<self> slashes his wrist and bleeds all over <other>.",
          self => "You slash your wrist and bleed all over <other>",
       },
       self => {
@@ -637,281 +695,239 @@
 for my $emotion (keys %$emotes) {
    cf::register_command $emotion => sub {
       my ($ob, $tname) = @_;
+
+      my $pl = $ob->contr;
       
       cf::async {
          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>."
-               if !$emote->{other};
-            $emote->{self} = "My god! Is that LEGAL?"
-               if !$emote->{self};
+            $emote{other} ||= "You look away from <self>.";
+            $emote{self}  ||= "My god! Is that LEGAL?";
 
-            $emote->{other} =~ s/<self>/$name/;
+            $emote{other} =~ s/<self>/$name/;
             
-            for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $ob;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+               for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
 
-            $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
          } elsif ($tname) {
             my $target = cf::player::find $tname
-               or return $ob->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 { $ob->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $ob or $other == $target;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "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);
-            $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout";
+            $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
          } 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 { $ob->on_same_map_as ($_->ob) } cf::player::list ) {
-               next
-                  if $other->ob == $ob;
-               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
-            }
+            $emote{other} =~ s/<self>/$name/;
 
-            $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+               for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
+
+            $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
          }
       };
    };
 }
 
+cf::register_command me => sub {
+   my ($pl, $msg) = @_;
+   
+   my $name = $pl->name;
+   
+   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;
+};
+
 cf::register_command say => sub {
-   my ($who, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
+   return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
 
    if ($msg) {
-      my $name = $who->name;
+      my $name = $ob->name;
+      my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
 
-      utf8::encode $msg; # ->message not yet utf8-ified
-      $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
-         for grep $who->on_same_map_as ($_->ob), cf::player::list;
-      utf8::decode $msg;
+      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 theirt-level inventories
-      # within a 5x5 square # that have something resembling
+      # first find all objects and their first-level inventories
+      # within a 5x5 square that have something resembling
       # dialogue or support on_say.
-      my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2);
+      my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
 
       for my $npc (
-         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->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)),
                      0..24
       ) {
          # if some listener teleported us somewhere else, stop right here
-         last unless $map->path == $who->map->path;
+         last unless $map->path == $ob->map->path;
 
-         my $dialog = new NPC_Dialogue ob => $who, npc => $npc;
+         my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
          my ($reply, @kw) = $dialog->tell ($msg);
 
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
                if (length $reply) {
-                  $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE)
-                     for grep $who->on_same_map_as ($_->ob), cf::player::list;
+                  send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
+                     for @plonmap;
                }
                $npc->use_trigger;
             } else {
                if (length $reply) {
-                  $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE)
-                     for grep $who->on_same_map_as ($_->ob), cf::player::list;
+                  send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
+                     for @plonmap;
                }
             }
          }
 
          if (@kw) {
-            $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE)
-               for grep $who->on_same_map_as ($_->ob), cf::player::list;
+            $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
+               for @plonmap;
          }
       }
 
    } else {
-      $who->message ("What do you want to say?", cf::NDI_UNIQUE);
+      $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
    }
-
-   1
 };
 
 cf::register_command chat => sub {
-   my ($who, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
+   my $pl = $ob->contr;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
 
    if ($msg) {
-      my $name = $who->name;
+      my $name = $ob->name;
       my $NOW = time;
 
-      utf8::encode $msg; # ->message not yet utf8-ified
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
-      ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg);
+      send_irc ("[%s] %s", $name, $msg);
 
-      $_->ob->message ("$name chats: $msg", cf::NDI_BLUE)
+      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 && $_->listening >= 10 } cf::player::list;
 
    } else {
-      $who->message ("Chat what?", cf::NDI_UNIQUE);
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
    }
-
-   1
 };
 
 cf::register_command shout => sub {
-   my ($who, $msg) = @_;
+   my ($ob, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->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 = $who->name;
+      my $name = $ob->name;
 
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
-      ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg);
+      send_irc ("\007\0034{%s} %s\n", $name, $msg);
 
-      utf8::encode $msg; # ->message not yet utf8-ified
-      $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
+      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 && $_->listening >= 2 } cf::player::list;
 
    } else {
-      $who->message ("Shout what?", cf::NDI_UNIQUE);
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
    }
-
-   1
 };
 
 cf::register_command tell => sub {
-   my ($who, $args) = @_;
+   my ($ob, $args) = @_;
    my ($target, $msg) = split /\s+/, $args, 2;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
+   my $pl = $ob->contr;
+   my $ns = $pl->ns
+      or return;
+   my $name  = $ob->name;
+
+   return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
 
-   my $name = $who->name;
+   my $pl_channel = tell_channel $target;
 
    if ($target =~ /irc\//) {
       my (undef, $nick) = split /\//, $target, 2;
-      $who->message ("You tell $target: $args");
-      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg);
+      $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 = tell_channel $name;
 
       if ($msg) {
          if ($target eq $name) {
-            $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
+            $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) {
-            $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
+            $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 {
-            utf8::encode $msg; # ->message not yet utf8-ified
+            return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
 
-            $who->message ("You tell $target: $msg");
-            $other->ob->message ("$name tells you: $msg");
-            $other->ob->{ext_last_tell} = $name;
+            $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 {
-         $who->message ("What do you want to tell $target?", cf::NDI_UNIQUE);
+         $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
       }
 
    } else {
-      $who->message ("No such player. Your message: $msg", cf::NDI_UNIQUE);
+      $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
    }
-
-   1
-};
-
-cf::register_command reply => sub {
-   my ($who, $args) = @_;
-   my $name = $who->name;
-
-   utf8::decode $args;
-
-   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args);
-
-   if ($who->{ext_last_tell} =~ /irc\//) {
-      my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2;
-      $who->message ("You tell " . $who->{ext_last_tell} . ": $args");
-      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
-   } elsif (my $other = cf::player::find_active $who->{ext_last_tell}) {
-
-      if ($args) {
-         $other->ob->{ext_ignore_tell}{$name} >= time
-            or delete $other->ob->{ext_ignore_tell}{$name};
-
-         if ($other->ob->{ext_ignore_tell}{$name} < time) {
-            utf8::encode $args; # ->message not yet utf8-ified
-            cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
-
-            $who->message ("You tell " . $other->ob->name . ": $args");
-            $other->ob->message ("$name tells you: $args");
-            $who->{ext_last_tell} = $other->ob->name;
-         } else {
-            $who->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
-         }
-      } else {
-         $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
-      }
-
-   } else {
-      $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE);
-   }
-
-   1
 };
 
 cf::register_command ignore => sub {
-   my ($who, $args) = @_;
+   my ($pl, $args) = @_;
    my ($target, $type, $timeout) = split /\s+/, $args;
 
    if ($args eq "list") {
-      clean_timeouts $who;
+      clean_timeouts $pl;
 
-      if ((my @ignored_tell = sort keys %{$who->{ext_ignore_tell}})
-          + (my @ignored_shout = sort keys %{$who->{ext_ignore_shout}})) {
-         $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
-         $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
-         $who->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
+      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 {
-         $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
+         $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
       }
 
    } elsif ($target && $type) {
@@ -921,90 +937,61 @@
 
       if (cf::player::exists $target) {
          if ($type eq "tell") {
-            $who->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_tell}{$target}  = $absolute_timeout;
+            $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") {
-            $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_shout}{$target} = $absolute_timeout;
+            $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
+            $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
          } elsif ($type eq "all") {
-            $who->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_tell}{$target}  = $absolute_timeout;
-            $who->{ext_ignore_shout}{$target} = $absolute_timeout;
+            $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 {
-            $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
          }
       } else {
-         $who->message ("No such player: $target", cf::NDI_UNIQUE);
+         $pl->message ("No such player: $target", cf::NDI_REPLY);
       }
 
    } else {
-      $who->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
+      $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);
+                   . "will show you a list of players currently ignored.", cf::NDI_REPLY);
    }
-
-   1
 };
 
 cf::register_command unignore => sub {
-   my ($who, $args) = @_;
+   my ($pl, $args) = @_;
    my ($target, $type) = split /\s+/, $args;
 
    if ($args eq "") {
-      if ($who->{ext_ignore_tell}) {
-         $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", sort keys %{ $who->{ext_ignore_tell} }), cf::NDI_UNIQUE);
-         $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", sort keys %{ $who->{ext_ignore_shout} }), cf::NDI_UNIQUE);
+      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 {
-         $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
+         $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
       }
    } else {
       if (cf::player::exists $target) {
          if ($type eq "tell") {
-            $who->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_tell} {$target};
+            $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
+            delete $pl->{ext_ignore_tell} {$target};
          } elsif ($type eq "shout") {
-            $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_shout}{$target};
+            $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
+            delete $pl->{ext_ignore_shout}{$target};
          } elsif ($type eq "all") {
-            $who->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_tell} {$target};
-            delete $who->{ext_ignore_shout}{$target};
+            $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
+            delete $pl->{ext_ignore_tell} {$target};
+            delete $pl->{ext_ignore_shout}{$target};
          } else {
-            $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
          }
       } else {
-         $who->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE);
+         $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
       }
    }
-
-   1
-};
-
-cf::register_command seen => sub {
-   my ($who, $args) = @_;
-
-   if (my ($login) = $args =~ /(\S+)/) {
-      if ($login eq $who->name) {
-         $who->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
-      } elsif (cf::player::find_active $login) {
-         $who->message ("$login is right here on this server!", cf::NDI_UNIQUE);
-      } elsif (cf::player::exists $login
-               and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
-         my $time = (stat _)[9];
-
-         $who->message ("$login was last seen here "
-                        . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
-                        . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
-      } else {
-         $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
-      }
-   } else {
-      $who->message ("Usage: seen <player>", cf::NDI_UNIQUE);
-   }
-
-   1
 };