talk w.i.o

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index b3718721c69a843fe947c8a06d0725f0f36c37dc..6e6b176ea928e4b3be8d5b51aa90351a12c0d7d2 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -175,25 +175,12 @@ sub start
        # sort out privilege reduction
        $self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->conn->peerhost eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
 
-       # get the filters
-       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) ;
-       $self->{rbnfilter} = Filter::read_in('rbn', $call, 0) 
-               || Filter::read_in('rbn', $nossid, 0)
-               || Filter::read_in('rbn', 'user_default', 0);
+       Filter::load_dxchan($self, 'spots', 0);
+       Filter::load_dxchan($self, 'wwv', 0);
+       Filter::load_dxchan($self, 'wcy', 0);
+       Filter::load_dxchan($self, 'ann', 0);
+       Filter::load_dxchan($self, 'rbn', 0);
        
        # clean up qra locators
        my $qra = $user->qra;
@@ -348,6 +335,8 @@ sub normal
                        for (@{$self->{talklist}}) {
                                if ($self->{state} eq 'talk') {
                                        $self->send_talks($_,  $self->msg('talkend'));
+                               } elsif ($self->{state} eq 'chat') {
+                                       $self->send_talks($_,  $self->msg('chatend'));
                                } else {
                                        $self->local_send('C', $self->msg('chatend', $_));
                                }
@@ -356,21 +345,25 @@ sub normal
                        delete $self->{talklist};
                } elsif ($cmdline =~ m|^[/\w\\]+|) {
                        $cmdline =~ s|^/||;
-                       my $sendit = $cmdline =~ s|^/+||;
+                       my $sendit = ($cmdline = unpad($cmdline));
                        if (@bad = BadWords::check($cmdline)) {
                                $self->badcount(($self->badcount||0) + @bad);
                                LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
                        } else {
-                               my @cmd = split /\s*\\n\s*/, $cmdline;
-                               foreach my $l (@cmd) {
-                                       my @in = $self->run_cmd($l);
+                               my $c;
+                               my @in;
+                               if (($c) = $cmdline =~ /^cmd\s+(.*)$/) {
+                                       @in = $self->run_cmd($c);
                                        $self->send_ans(@in);
+                               } else {
+                                       push @in, $cmdline;
                                        if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
                                                foreach my $l (@in) {
                                                        for (@{$self->{talklist}}) {
                                                                if ($self->{state} eq 'talk') {
                                                                        $self->send_talks($_, $l);
-                                                               } else {
+                                                               }
+                                                               else {
                                                                        send_chats($self, $_, $l)
                                                                }
                                                        }