fixed Aliases so that shutdown works again.

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 1f6d155158dc7e3e48437bb0b553fe2cdefe32ca..bb7164379bdc5ce0bb698f3a23e8a594ea4be64e 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -31,14 +31,20 @@ if ($via) {
 $to = uc $to if $to;
 $via = uc $via if $via;
 my $call = $via ? $via : $to;
-my $clref = DXCluster->get_exact($call);     # try an exact call
+my $clref = Route::get($call);     # try an exact call
 my $dxchan = $clref->dxchan if $clref;
 return (1, $self->msg('e7', $call)) unless $dxchan;
 
 # if there is a line send it, otherwise add this call to the talk list
 # and set talk mode for command mode
 if ($line) {
-       $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
+       my @bad;
+       if (@bad = BadWords::check($line)) {
+               $self->badcount(($self->badcount||0) + @bad);
+               Log('DXCommand', "$self->{call} swore: $line");
+       } else {
+               $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
+       }
 } else {
        my $s = $to;
        $s .= ">$via" if $via;