use correcr call for buddies on logout

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 9b395c0cea691c70b543423c33dcf34509d48db6..0e01208723a524fada6d2610e7f1cfb628115b91 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -35,6 +35,7 @@ use Net::Telnet;
 use QSL;
 use DB_File;
 use VE7CC;
+use DXXml;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
@@ -93,7 +94,7 @@ sub start
        my $host = $self->{conn}->{peerhost};
        $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
        $host ||= "unknown";
-       Log('DXCommand', "$call connected from $host");
+       LogDbg('DXCommand', "$call connected from $host");
 
        $self->{name} = $name ? $name : $call;
        $self->send($self->msg('l2',$self->{name}));
@@ -149,10 +150,21 @@ sub start
        $self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
 
        # get the filters
-       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
-       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
-       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
-       $self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
+       my $nossid = $call;
+       $nossid =~ s/-\d+$//;
+       
+       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) 
+               || Filter::read_in('spots', $nossid, 0)
+                       || Filter::read_in('spots', 'user_default', 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) 
+               || Filter::read_in('wwv', $nossid, 0) 
+                       || Filter::read_in('wwv', 'user_default', 0);
+       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) 
+               || Filter::read_in('wcy', $nossid, 0) 
+                       || Filter::read_in('wcy', 'user_default', 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0) 
+               || Filter::read_in('ann', $nossid, 0) 
+                       || Filter::read_in('ann', 'user_default', 0) ;
 
        # clean up qra locators
        my $qra = $user->qra;
@@ -172,6 +184,7 @@ sub start
        }
        
        $self->tell_login('loginu');
+       $self->tell_buddies('loginb');
        
        # do we need to send a forward/opernam?
        my $lastoper = $user->lastoper || 0;
@@ -297,7 +310,7 @@ sub normal
                                        my @bad;
                                        if (@bad = BadWords::check($l)) {
                                                $self->badcount(($self->badcount||0) + @bad);
-                                               Log('DXCommand', "$self->{call} swore: $l");
+                                               LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
                                        } else {
                                                for (@{$self->{talklist}}) {
                                                        $self->send_talks($_, $l);
@@ -311,7 +324,7 @@ sub normal
                        my @bad;
                        if (@bad = BadWords::check($cmdline)) {
                                $self->badcount(($self->badcount||0) + @bad);
-                               Log('DXCommand', "$self->{call} swore: $cmdline");
+                               LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
                        } else {
                                for (@{$self->{talklist}}) {
                                        $self->send_talks($_, $rawline);
@@ -343,7 +356,7 @@ sub normal
 
        # check for excessive swearing
        if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
-               Log('DXCommand', "$self->{call} logged out for excessive swearing");
+               LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
                $self->disconnect;
                return;
        }
@@ -432,7 +445,8 @@ sub run_cmd
        
 
        return () if length $cmdline == 0;
-               
+       
+       
        # split the command line up into parts, the first part is the command
        my ($cmd, $args) = split /\s+/, $cmdline, 2;
        $args = "" unless defined $args;
@@ -560,8 +574,9 @@ sub disconnect
                
        # send info to all logged in thingies
        $self->tell_login('logoutu');
+       $self->tell_buddies('logoutb');
 
-       Log('DXCommand', "$call disconnected");
+       LogDbg('DXCommand', "$call disconnected");
 
        $self->SUPER::disconnect;
 }
@@ -1025,8 +1040,7 @@ sub import_cmd
        # are there any to do in this directory?
        return unless -d $cmdimportdir;
        unless (opendir(DIR, $cmdimportdir)) {
-               dbg("can\'t open $cmdimportdir $!");
-               Log('err', "can\'t open $cmdimportdir $!");
+               LogDbg('err', "can\'t open $cmdimportdir $!");
                return;
        } 
 
@@ -1038,9 +1052,7 @@ sub import_cmd
 
                my $s = Script->new($name, $cmdimportdir);
                if ($s) {
-
-                       dbg("Run import cmd file $name");
-                       Log('DXCommand', "Run import cmd file $name");
+                       LogDbg('DXCommand', "Run import cmd file $name");
                        my @cat = split /[^A-Za-z0-9]+/, $name;
                        my ($call) = grep {is_callsign(uc $_)} @cat;
                        $call ||= $main::mycall;
@@ -1071,19 +1083,16 @@ sub import_cmd
                                                $dxchan->{priv} = $priv;
                                                $dxchan->{user} = $user;
                                        } else {
-                                               Log('err', "Trying to run import cmd for non-existant user $call");
-                                               dbg( "Trying to run import cmd for non-existant user $call");
+                                               LogDbg('err', "Trying to run import cmd for non-existant user $call");
                                        }
                                }
                        }
                        $s->erase;
                        for (@out) {
-                               Log('DXCommand', "Import cmd $name/$call: $_");
-                               dbg("Import cmd $name/$call: $_");
+                               LogDbg('DXCommand', "Import cmd $name/$call: $_");
                        }
                } else {
-                       Log("Failed to open $cmdimportdir/$name $!");
-                       dbg("Failed to open $cmdimportdir/$name $!");
+                       LogDbg('err', "Failed to open $cmdimportdir/$name $!");
                        unlink "$cmdimportdir/$name";
                }
        }