X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=66d3cd2c72dd5d2152a5921784a4749aaeaaea70;hb=8d130b37aba97ea31c90d20eb466d0d553eb761b;hp=9cdd1c58bde99deeca39e9a488dd3194e24b9345;hpb=8e45a3dac2e136dc0c9d6f1e78f8c048a8d7ba21;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 9cdd1c58..66d3cd2c 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -12,6 +12,7 @@ my $via;
 my $line;
 my $from = $self->call;
 my @out;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 
 # analyse the line there are four situations...
 # 1) talk call
@@ -30,16 +31,24 @@ 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) {
-	$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
+	my @bad;
+	if (@bad = BadWords::check($line)) {
+		$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;
+	}
 } else {
-	my $s = "$to>" . $dxchan->call;
+	my $s = $to;
+	$s .= ">$via" if $via;
 	my $ref = $self->talklist;
 	if ($ref) {
 		unless (grep { $_ eq $s } @$ref) {