projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a nominially working aranea with DX commands converted
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 8082e240ae0c5ac1092115df068feaaa525b6814..2815ad39c710896b82e72e0a04575b7b14686b7b 100644
(file)
--- a/
cmd/talk.pl
+++ b/
cmd/talk.pl
@@
-12,7
+12,7
@@
my $via;
my $line;
my $from = $self->call;
my @out;
my $line;
my $from = $self->call;
my @out;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd
|| $self->inscript
;
# analyse the line there are four situations...
# 1) talk call
# analyse the line there are four situations...
# 1) talk call
@@
-31,18
+31,21
@@
if ($via) {
$to = uc $to if $to;
$via = uc $via if $via;
my $call = $via ? $via : $to;
$to = uc $to if $to;
$via = uc $via if $via;
my $call = $via ? $via : $to;
-my $clref =
DXCluster->get_exac
t($call); # try an exact call
+my $clref =
Route::ge
t($call); # try an exact call
my $dxchan = $clref->dxchan if $clref;
return (1, $self->msg('e7', $call)) unless $dxchan;
my $dxchan = $clref->dxchan if $clref;
return (1, $self->msg('e7', $call)) unless $dxchan;
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
# if there is a line send it, otherwise add this call to the talk list
# and set talk mode for command mode
if ($line) {
my @bad;
if (@bad = BadWords::check($line)) {
# if there is a line send it, otherwise add this call to the talk list
# and set talk mode for command mode
if ($line) {
my @bad;
if (@bad = BadWords::check($line)) {
- return (1, $self->msg('e17', @bad));
+ $self->badcount(($self->badcount||0) + @bad);
+ Log('DXCommand', "$self->{call} swore: $line");
+ } else {
+ $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
}
}
- $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
} else {
my $s = $to;
$s .= ">$via" if $via;
} else {
my $s = $to;
$s .= ">$via" if $via;