mega-merge of major parts of mojo

[spider.git] / cmd / announce.pl

diff --git a/cmd/announce.pl b/cmd/announce.pl
index a7edb6c076cab7d84bcdd5cd78fb39138bd4258c..9065993b78b02746726c3d62728279d6f248a8b9 100644 (file)
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -10,54 +10,71 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # Modified 13Dec98 Iain Phillips G0RDI
 #
 
 my ($self, $line) = @_;
+#$DB::single = 1;
+my $addr = $self->hostname || '127.0.0.1';
+Log('cmd', "$self->{call}|$addr|announce|$line");
 my @f = split /\s+/, $line;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e9')) if !@f;
+return (1, $self->msg('e28')) unless $self->isregistered;
 
 my $sort = uc $f[0];
-my @locals = DXCommandmode->get_all();
-my $to;
+my $to = '*';
 my $from = $self->call;
 my $t = ztime(time);
 my $tonode;
 my $toflag = '*';
 my $sysopflag;
+my $via = 'LOCAL';
 
 if ($sort eq "FULL") {
   $line =~ s/^$f[0]\s+//;    # remove it
-  $to = "All";
+  $via = $to = "*";
 } elsif ($sort eq "SYSOP") {
   $line =~ s/^$f[0]\s+//;     # remove it
-  @locals = map { $_->priv >= 5 ? $_ : () } @locals;
-  $to = "Sysop";
-  $sysopflag = '*';
+  $to = "SYSOP";
+  $via = $sysopflag = '*';
 } elsif ($sort eq "LOCAL") {
   $line =~ s/^$f[0]\s+//;     # remove it
-  $to = "Local";
-} else {
-  $to = "Local";
 }
 
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
+# if this is a 'bad spotter' user then ignore it
+my $nossid = $from;
+my $drop = 0;
+$nossid =~ s/-\d+$//;
+if ($DXProt::badspotter->in($nossid)) {
+       LogDbg('DXCommand', "bad spotter ($self->{call}) made announcement: $line");
+       $drop++;
+}
 
+# have they sworn?
 my @bad;
 if (@bad = BadWords::check($line)) {
-       return (1, $self->msg('e17', @bad));
+       $self->badcount(($self->badcount||0) + @bad);
+       LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+       $drop++;
 }
 
-return (1, $self->msg('dup')) if AnnTalk::dup($from, $toflag, $line);
-Log('ann', $to, $from, $line);
-DXProt::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
-if ($to ne "Local") {
-  my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
-  DXProt::broadcast_ak1a($pc);
+if ($drop) {
+       Log('ann', $to, $from, "[to $from only] $line");
+       $self->send("To $to de $from: $line");
+       return (1, ());
 }
 
+#return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line);
+Log('ann', $to, $from, $line);
+$main::me->normal(DXProt::pc93($to, $from, $via, $line));
+
+#DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals);
+#if ($to ne "LOCAL") {
+#  my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
+#  DXChannel::broadcast_nodes($pc);
+#}
+
 return (1, ());