add chat/wx/announce handling to PC93

[spider.git] / cmd / announce.pl

diff --git a/cmd/announce.pl b/cmd/announce.pl
index a3ccb5b033d7f98dc8a9044212c40f0c3e38dcdc..a3d3fd61718b10a184591041044c1eb9b6fb817a 100644 (file)
--- a/cmd/announce.pl
+++ b/cmd/announce.pl
@@ -22,32 +22,25 @@ return (1, $self->msg('e9')) if !@f;
 return (1, $self->msg('e28')) unless $self->registered;
 
 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 = '*';
+  $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;
@@ -67,16 +60,18 @@ if (@bad = BadWords::check($line)) {
 
 if ($drop) {
        Log('ann', $to, $from, "[to $from only] $line");
-       $self->send("To $to de $from <$t>: $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);
-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);
-}
+$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, ());