fix swearing logging so that it is better.

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 8082e240ae0c5ac1092115df068feaaa525b6814..66d3cd2c72dd5d2152a5921784a4749aaeaaea70 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -12,7 +12,7 @@ my $via;
 my $line;
 my $from = $self->call;
 my @out;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 
 # analyse the line there are four situations...
 # 1) talk call
@@ -31,18 +31,21 @@ 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;
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
 
 # if there is a line send it, otherwise add this call to the talk list
 # and set talk mode for command mode
 if ($line) {
        my @bad;
        if (@bad = BadWords::check($line)) {
-               return (1, $self->msg('e17', @bad));
+               $self->badcount(($self->badcount||0) + @bad);
+               LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+       } else {
+               $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
        }
-       $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 } else {
        my $s = $to;
        $s .= ">$via" if $via;