projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rejigged and made certain things clearer
[spider.git]
/
cmd
/
announce.pl
diff --git
a/cmd/announce.pl
b/cmd/announce.pl
index b839e9c75bc2dd5169cff4f820e549ce17f410a0..d2755b2df46309014c1b657e717baa94376992f4 100644
(file)
--- a/
cmd/announce.pl
+++ b/
cmd/announce.pl
@@
-17,7
+17,7
@@
my ($self, $line) = @_;
my @f = split /\s+/, $line;
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];
return (1, $self->msg('e9')) if !@f;
my $sort = uc $f[0];
@@
-26,6
+26,7
@@
my $to;
my $from = $self->call;
my $t = ztime(time);
my $tonode;
my $from = $self->call;
my $t = ztime(time);
my $tonode;
+my $toflag = '*';
my $sysopflag;
if ($sort eq "FULL") {
my $sysopflag;
if ($sort eq "FULL") {
@@
-39,18
+40,25
@@
if ($sort eq "FULL") {
} elsif ($sort eq "LOCAL") {
$line =~ s/^$f[0]\s+//; # remove it
$to = "LOCAL";
} elsif ($sort eq "LOCAL") {
$line =~ s/^$f[0]\s+//; # remove it
$to = "LOCAL";
-} elsif ($sort eq "") {
- $to = "LOCAL";
} else {
} else {
- return (1, $self->msg('e11'));
+ $to = "LOCAL";
+}
+
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
+
+my @bad;
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ return (1, $self->msg('e17', @bad));
}
}
+return (1, $self->msg('dup')) if AnnTalk::dup($from, $toflag, $line);
Log('ann', $to, $from, $line);
Log('ann', $to, $from, $line);
-DX
Prot::broadcast_list("To $to de $from <$t>: $line"
, @locals);
+DX
Channel::broadcast_list("To $to de $from <$t>: $line", 'ann', undef
, @locals);
if ($to ne "LOCAL") {
if ($to ne "LOCAL") {
- $line =~ s/\^//og; # remove ^ characters!
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0);
- DX
Prot::broadcast_ak1a
($pc);
+ DX
Channel::broadcast_nodes
($pc);
}
return (1, ());
}
return (1, ());