X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=f21e2851bc90790891003b6a24cd43869147fe47;hb=de7634cfdcc23dfc6fd9457d27245f27ddf2e252;hp=8082e240ae0c5ac1092115df068feaaa525b6814;hpb=8e0eef80216fbb2bca3606daf5797e39b2889d7a;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 8082e240..f21e2851 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -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);
+		Log('DXCommand', "$self->{call} swore: $line");
+	} 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;