--- deliantra/server/ext/chat.ext	2008/08/29 02:07:09	1.42
+++ deliantra/server/ext/chat.ext	2010/04/22 12:50:24	1.54
@@ -56,7 +56,9 @@
    on_login => sub {
       my ($pl) = @_;
 
-      clean_timeouts $pl->ob;
+      cf::async {
+         clean_timeouts $pl->ob;
+      };
 
       $pl->send_msg ($cf::SAY_CHANNEL);
       $pl->send_msg ($cf::CHAT_CHANNEL);
@@ -73,7 +75,7 @@
    my $pl = $ob->contr;
    my $name = $ob->name;
 
-   my $coin = int rand 2 ? "Heads" : "Tails";
+   my $coin = (cf::rndm 2) ? "Heads" : "Tails";
 
    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;
@@ -88,7 +90,7 @@
    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 ($i, $j, $k, $l) = map +(cf::rndm $_), 5, 5, 5, 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"
@@ -150,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 => {
@@ -169,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.",
       },
    },
@@ -218,7 +220,7 @@
    kiss => {
       noparams => {
          other => "<self> makes a weird facial contortion",
-         self => "All the lonely people..",
+         self => "All the lonely people...",
       },
       params => {
          target => "<self> kisses you.",
@@ -228,10 +230,25 @@
       self => {
       },
    },
+   hug => {
+      noparams => {
+         other => "<self> makes weird body movements.",
+         self => "All the lonely people...",
+      },
+      params => {
+         target => "<self> suddenly grabs you and gives you a bear hug.",
+         other => "<self> hugs <other>.",
+         self => "You hug <other>.",
+      },
+      self => {
+         other => "<self> tries to hug G<himself|herself>, but stumbles and now feels stupid.",
+         self => "You try and fail to hug yourself.",
+      },
+   },
    smother => {
       noparams => {
          other => "<self> makes weird facial contortions",
-         self => "All the lonely people..",
+         self => "All the lonely people...",
       },
       params => {
          target => "<self> smothers you with kisses.",
@@ -252,7 +269,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?",
       },
    },
@@ -268,7 +285,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 => {
@@ -287,7 +304,7 @@
          self => "You sniff <other>.",
       },
       self => {
-         other => "<self> sniffs himself.",
+         other => "<self> sniffs G<him|her>self.",
          self => "You sniff yourself.",
       },
    },
@@ -297,9 +314,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 => {
       },
@@ -315,7 +332,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.",
       },
    },
@@ -348,18 +365,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 => {
@@ -369,7 +386,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 => {
@@ -378,13 +395,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 => {
@@ -393,7 +410,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.",
       },
    },
@@ -408,13 +425,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 => {
@@ -423,7 +440,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.",
       },
    },
@@ -449,7 +466,7 @@
    },
    snap => {
       noparams => {
-         other => "<self> snaps his fingers.",
+         other => "<self> snaps G<his|her> fingers.",
          self => "PRONTO! you snap your fingers.",
       },
       params => {
@@ -468,7 +485,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??",
       },
    },
@@ -492,11 +509,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!",
       },
    },
@@ -515,7 +532,7 @@
    },
    shake => {
       noparams => {
-         other => "<self> shakes his head.",
+         other => "<self> shakes G<his|her> head.",
          self => "You shake your head.",
       },
       params => {
@@ -530,7 +547,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 => {
@@ -539,7 +556,7 @@
          self => "You lick <other>.",
       },
       self => {
-         other => "<self> licks himself - YUCK.",
+         other => "<self> licks G<him|her>self - YUCK.",
          self => "You lick yourself.",
       },
    },
@@ -555,7 +572,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 => {
@@ -629,7 +646,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.",
       },
    },
@@ -653,7 +670,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.",
       },
    },
@@ -709,11 +726,14 @@
             $emote{self}  ||= "My god! Is that LEGAL?";
 
             $emote{other} =~ s/<self>/$name/;
+
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
             
-            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            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->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          } elsif ($tname) {
             my $target = cf::player::find $tname
                or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
@@ -729,11 +749,14 @@
             $emote{other}  =~ s/<other>/$tname/;
             $emote{other}  =~ s/<self>/$name/;
             
-            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            $_ = $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;
 
-            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);
+            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} || {} };
 
@@ -742,24 +765,18 @@
             
             $emote{other} =~ s/<self>/$name/;
 
-            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            $_ = $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->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          }
       };
    };
 }
 
-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 ($ob, $msg) = @_;
 
@@ -775,43 +792,58 @@
          for grep $_ != $ob->contr, @plonmap;
       $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
 
+      my @npc;
+
       # npcs, magic_ears etc.
       # 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) = ($ob->map, $ob->x - 2, $ob->y - 2);
+      # we prefer the nearest items NOT in the player, otherwise in player.
+      my ($map, $x, $y) = ($ob->map, $ob->x, $ob->y);
 
-      for my $npc (
-         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
+      for my $dir (
+         0,
+         1, 3, 5, 7,
+         2, 4, 6, 8,
+         9 .. cf::SIZEOFFREE2
       ) {
+         @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
+                   map +($_, $_->inv),
+                      grep $_ != $ob,
+                         $map->at ($x, $y, $dir)
+            and last;
+      }
+
+      unless (@npc) {
+         # nothing found, try the player inventory
+         @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
+                   $ob->inv;
+      }
+
+      for my $npc (@npc) {
+         return if $npc->invoke (cf::EVENT_OBJECT_SAY);
+
          # if some listener teleported us somewhere else, stop right here
          last unless $map->path == $ob->map->path;
 
-         my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
-         my ($reply, @kw) = $dialog->tell ($msg);
+         if ($npc->has_dialogue) {
+            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) {
+            if (defined $reply) {
+               if ($npc->type == cf::MAGIC_EAR) {
                   send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
                      for @plonmap;
-               }
-               $npc->use_trigger;
-            } else {
-               if (length $reply) {
+               } else {
                   send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
                      for @plonmap;
                }
             }
-         }
 
-         if (@kw) {
-            $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
-               for @plonmap;
+            if (@kw) {
+               $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
+                  for @plonmap;
+            }
          }
       }
 
@@ -820,10 +852,9 @@
    }
 };
 
-cf::register_command chat => sub {
-   my ($ob, $msg) = @_;
 
-   utf8::decode $msg;
+sub _chat {
+   my ($ob, $msg) = @_;
 
    my $pl = $ob->contr;
 
@@ -833,15 +864,29 @@
       my $name = $ob->name;
       my $NOW = time;
 
-      cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
-      send_irc ("[%s] %s", $name, $msg);
+      cf::LOG cf::llevDebug, sprintf "QBERT %s\n", $msg;
+      send_irc ("%s", $msg);
 
-      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;
+      send_msg $_, $cf::CHAT_CHANNEL => $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->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
    }
+}
+
+cf::register_command chat => sub {
+   my ($ob, $msg) = @_;
+
+   utf8::decode $msg;
+   _chat $ob, $ob->name . " chats: $msg";
+};
+
+cf::register_command me => sub {
+   my ($ob, $msg) = @_;
+   
+   utf8::decode $msg;
+   _chat $ob, "* " . $ob->name . " $msg";
 };
 
 cf::register_command shout => sub {
@@ -861,7 +906,7 @@
       send_irc ("\007\0034{%s} %s\n", $name, $msg);
 
       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;
+         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
 
    } else {
       $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
@@ -916,82 +961,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_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 ("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;
+   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_REPLY);
+            $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_REPLY);
+         $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_REPLY);
-   }
+   };
 };
 
 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_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 ("Not ignoring anyone", cf::NDI_REPLY);
-      }
-   } else {
-      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};
+   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_REPLY);
+            $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
          }
       } else {
-         $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
+         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);
+         }
       }
-   }
+   };
 };