5. fix talkmode so that it only does 'via' PC10s when it really needs to.

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 5e9eec1ccf6e78a12a358b46eb11b7c51ff200f7..75ba77dc866e8a0152d918a1ce514a9c6660186a 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,6 +15,7 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
@@ -97,10 +98,10 @@ $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);
+       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {
-       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $main::systime, $line);
+       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
        my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
        if (@spot) {
                # send orf to the users