DX 69 will act as baddx

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 7684542eb19251f1d87dafa8253232f4b8bea4e9..73ba0de0e4275dd74d11d4c63f06244146673786 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,6 +15,13 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
+
+my @bad;
+if (@bad = BadWords::check($line)) {   
+       $self->badcount(($self->badcount||0) + @bad);
+       return (1, $self->msg('e17', @bad));
+}
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
@@ -32,16 +39,17 @@ if ($f[0] =~ /^by$/i) {
 }
 
 # get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
        $spotted = uc $f[0];
        $freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
     $freq = $f[0];
        $spotted = uc $f[1];
 } else {
-       return (1, $self->msg('dx2'));
+       return (1, $self->msg('dx3'));
 }
 
+
 # make line the rest of the line
 $line = $f[2] || " ";
 @f = split /\s+/, $line;
@@ -92,19 +100,33 @@ if ($spotted le ' ') {
 
 return (1, @out) unless $valid;
 
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
 
 # Store it here (but only if it isn't baddx)
-if (grep $_ eq $spotted, @DXProt::baddx) {
-       my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/) {
+
+       # heaven forfend that we get a 69Mhz band :-)
+       if ($freq =~ /^69/) {
+               $self->badcount(($self->badcount||0) + 1);
+       }
+
+       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {
-       my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
+       my $t = (int ($main::systime/60)) * 60;
+       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line);
+       my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
        if (@spot) {
+               # store it 
+               Spot::add(@spot);
+
                # send orf to the users
                DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
        }
 }
 
 return (1, @out);
+
+
+
+
+