1. Upped the version no !!!!

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 953d5f2d3eae3fc6abf8cac10c098d41ec9e14d0..e94fd0250e30cf262671082438df449fe666cad4 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -7,26 +7,49 @@
 #
 
 my ($self, $line) = @_;
-my @argv = split /\s+/, $line;               # generate an argv
+my @argv = split /\s+/, $line; # generate an argv
 my $to = uc $argv[0];
 my $via;
 my $from = $self->call();
+my @out;
+
+# have we a callsign and some text?
+return (1, $self->msg('e8')) if @argv < 2;
 
 if ($argv[1] eq '>') {
-  $via = uc $argv[2];
-  $line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
+       $via = uc $argv[2];
+       $line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
 } else {
-  $line =~ s/^$argv[0]\s*//;
+       $line =~ s/^$argv[0]\s*//;
 }
 
-my $dxchan = DXCommandmode->get($to);         # is it for us?
+my $call = $via ? $via : $to;
+my $ref = DXCluster->get($call);
+
+# if we haven't got an explicit via and we can't see them, try their node
+unless ($ref || $via) {
+       my $user = DXUser->get($call);
+       $ref = DXCluster->get_exact($user->node);
+       if ($ref) {
+               $via = $user->node;
+               push @out, "trying via $via..";
+       }
+}
+return (1, "$call not visible on the cluster") if !$ref;
+
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
+my $dxchan = DXCommandmode->get($to); # is it for us?
 if ($dxchan && $dxchan->is_user) {
-  $dxchan->send("$to de $from $line");
+       $dxchan->send("$to de $from $line");
+       Log('talk', $to, $from, $main::mycall, $line);
 } else {
-  $line =~ s/\^//og;            # remove any ^ characters
-  my $prot = DXProt::pc10($self, $to, $via, $line);
-  DXProt::route($via?$via:$to, $prot);
+       $line =~ s/\^//og;                      # remove any ^ characters
+       my $prot = DXProt::pc10($from, $to, $via, $line);
+       DXProt::route($via?$via:$to, $prot);
+       Log('talk', $to, $from, $via?$via:$main::mycall, $line);
 }
 
-return (1, ());
+return (1, @out);