]> dxcluster.org Git - spider.git/commitdiff
talk w.i.o
authorDirk Koopman <djk@tobit.co.uk>
Thu, 21 Mar 2024 12:29:33 +0000 (12:29 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Thu, 21 Mar 2024 12:29:33 +0000 (12:29 +0000)
cmd/talk.pl
perl/DXCommandmode.pm

index 2d40b788a7714503550de532a3c781025f48aa38..4f609aaadfd539bd21014c4286e410d64916a043 100644 (file)
@@ -21,7 +21,7 @@ return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 # 4) talk call>node text
 #
 
-($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)\s*>([A-Za-z0-9\-]+)(.*)$/;
+($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)(?:\s*>([A-Za-z0-9\-]+))?\s+(.*)$/;
 if ($via) {
        $line =~ s/\s+// if $line;
 } else {
@@ -37,28 +37,30 @@ return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalia
 
 $via = uc $via if $via;
 my $call = $via || $to;
-my $clref = Route::get($call);     # try an exact call
-my $dxchan = $clref->dxchan if $clref;
+#my $clref = Route::get($call);     # try an exact call
+#my $dxchan = $clref->dxchan if $clref;
 #push @out, $self->msg('e7', $call) unless $dxchan;
 
 #$DB::single = 1;
 
 # default the 'via'
-#$via ||= '*';
+$via ||= '*';
 
 my $ipaddr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1');
 
 # if there is a line send it, otherwise add this call to the talk list
 # and set talk mode for command mode
+my @bad;
+if (@bad = BadWords::check($line)) {
+       $self->badcount(($self->badcount||0) + @bad);
+       LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+}
+
+my $dxchan;
+
 if ($line) {
-       my @bad;
        Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $line);
-       if (@bad = BadWords::check($line)) {
-               $self->badcount(($self->badcount||0) + @bad);
-               LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
-       } else {
-               $main::me->normal(DXProt::pc93($to, $self->call, $via, $line, undef, $ipaddr));
-       }
+       $main::me->normal(DXProt::pc93($to, $self->call, $via, $line, undef, $ipaddr));
 } else {
        my $s = $to;
        $s .= ">$via" if $via && $via ne '*';
index 64483a07407cd3ced942d7d248d63feae0f4c8f1..6e6b176ea928e4b3be8d5b51aa90351a12c0d7d2 100644 (file)
@@ -335,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', $_));
                                }
@@ -343,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)
                                                                }
                                                        }