X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=6eb1810ee2418bc342cb613235de09090e23214d;hb=b85ee0ca2b03ee2c5be20bd430cfa00757b7ebdb;hp=bb5f7ad0b91135871b3bcafd5c4def0fc300529d;hpb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;p=spider.git

diff --git a/cmd/announce.pl b/cmd/announce.pl
index bb5f7ad0..6eb1810e 100644
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -17,7 +17,7 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
-
+return (1, $self->msg('e5')) if $self->remotecmd;
 return (1, $self->msg('e9')) if !@f;
 
 my $sort = uc $f[0];
@@ -46,10 +46,15 @@ if ($sort eq "FULL") {
 # change ^ into : for transmission
 $line =~ s/\^/:/og;
 
+my @bad;
+if (@bad = BadWords::check($line)) {
+	return (1, $self->msg('e17', @bad));
+}
+
+return (1, $self->msg('dup')) if AnnTalk::dup($from, $to, $line);
 Log('ann', $to, $from, $line);
-DXProt::broadcast_list("To $to de $from <$t>: $line", @locals);
+DXProt::broadcast_list("To $to de $from <$t>: $line", 'ann', undef, @locals);
 if ($to ne "LOCAL") {
-  $line =~ s/\^//og;    # remove ^ characters!
   my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
   DXProt::broadcast_ak1a($pc);
 }