fix free talking in command mode

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 1f6d155158dc7e3e48437bb0b553fe2cdefe32ca..4673392a0ca345fba3d28399b0b75982e2e691eb 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,27 +31,39 @@ 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('e7', $call)) unless $dxchan;
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+
+$DB::single = 1;
+
+# default the 'via'
+#$via ||= '*';
 
 # 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 {
+               $main::me->normal(DXProt::pc93($to, $self->call, $via, $line));
+       }
 } else {
        my $s = $to;
-       $s .= ">$via" if $via;
+       $s .= ">$via" if $via && $via ne '*';
        my $ref = $self->talklist;
        if ($ref) {
                unless (grep { $_ eq $s } @$ref) {
-                       $dxchan->talk($self->call, $to, $via, $self->msg('talkstart'));
+                       $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
                        $self->state('talk');
                        push @$ref, $s;
                }
        } else { 
                $self->talklist([ $s ]);
-               $dxchan->talk($self->call, $to, $via, $self->msg('talkstart'));
+               $main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
                push @out, $self->msg('talkinst');
                $self->state('talk');
        }