#
my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
my $spotter = $self->call;
my $spotted;
my $freq;
my @out;
my $valid = 0;
+my $localonly;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e28')) unless $self->registered;
-# first lets see if we think we have a callsign as the first argument
-if (defined @f && @f >= 3 && $f[0] =~ /[A-Za-z]/) {
- $spotter = uc $f[0];
+my @bad;
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ Log('DXCommand', "$self->{call} swore: $line");
+ $localonly++;
+}
+
+# do we have at least two args?
+return (1, $self->msg('dx2')) unless @f >= 2;
+
+# as a result of a suggestion by Steve K9AN, I am changing the syntax of
+# 'spotted by' things to "dx by g1tlh <freq> <call>" <freq> and <call>
+# can be in any order
+
+if ($f[0] =~ /^by$/i) {
+ return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
+ $spotter = uc $f[1];
+ $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+# $line = $f[2];
+ @f = split /\s+/, $line, 3;
+ return (1, $self->msg('dx2')) unless @f >= 2;
+}
+
+# get the freq and callsign either way round
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+ $spotted = uc $f[0];
$freq = $f[1];
- $spotted = uc $f[2];
- $line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
-} elsif (defined @f && @f >= 2) {
- $freq = $f[0];
- $spotted = uc $f[1];
- $line =~ s/^$f[0]\s+$f[1]\s*//;
-} elsif (!defined @f || @f < 2) {
- return (1, $self->msg('dx2'));
+} 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('dx3'));
}
+# make line the rest of the line
+$line = $f[2] || " ";
+@f = split /\s+/, $line;
+
# bash down the list of bands until a valid one is reached
my $bandref;
my @bb;
}
}
-if (!$valid) {
+unless ($valid) {
# try again in MHZ
$freq = $freq * 1000 if $freq;
}
-push @out, $self->msg('dx1', $freq) if !$valid;
+push @out, $self->msg('dx1', $freq) unless $valid;
# check we have a callsign :-)
if ($spotted le ' ') {
push @out, $self->msg('dx2');
-
$valid = 0;
}
-return (1, @out) if !$valid;
-
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
+return (1, @out) unless $valid;
# 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);
- push @out, $buf;
-} else {
- my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
- if (@spot) {
- # send orf to the users
- my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
- DXProt::broadcast_users($buf, 'dx', \@spot);
-
- # send it orf to the cluster (hang onto your tin helmets)
- DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+my $t = (int ($main::systime/60)) * 60;
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+my $thing = Thingy::Dx->new(user=>$spotter);
+$thing->from_DXProt(spotdata=>\@spot);
+
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
+
+ # heaven forfend that we get a 69Mhz band :-)
+ if ($freq =~ /^69/) {
+ $self->badcount(($self->badcount||0) + 1);
}
+} else {
+ $thing->queue($self);
}
-
+push @out, $thing->gen_DXCommandmode($self);
return (1, @out);
+
+
+
+
+