projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix lack of warnins.pm in 5.005004
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 45ac857ee935bf7bb7fa7f142435f79da82edf5b..ebd762ff1630e55d5df003657db69270fc2fb87a 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
@@
-30,35
+30,45
@@
if ($via) {
$to = uc $to if $to;
$via = uc $via if $via;
$to = uc $to if $to;
$via = uc $via if $via;
-my $call = $via
? $via :
$to;
+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;
-return (1, $self->msg('e7', $call)) unless $dxchan;
+#return (1, $self->msg('e7', $call)) unless $dxchan;
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+
+#$DB::single = 1;
+
+# default the 'via'
+#$via ||= '*';
# 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 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;
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $line);
if (@bad = BadWords::check($line)) {
if (@bad = BadWords::check($line)) {
- return (1, $self->msg('e17', @bad));
+ $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));
}
}
- $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
} else {
my $s = $to;
} else {
my $s = $to;
- $s .= ">$via" if $via;
+ $s .= ">$via" if $via
&& $via ne '*'
;
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
- $
dxchan->talk($self->call, $to, $via, $self->msg('talkstart'
));
+ $
main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')
));
$self->state('talk');
push @$ref, $s;
}
} else {
$self->talklist([ $s ]);
$self->state('talk');
push @$ref, $s;
}
} else {
$self->talklist([ $s ]);
- $
dxchan->talk($self->call, $to, $via, $self->msg('talkstart'
));
+ $
main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')
));
push @out, $self->msg('talkinst');
$self->state('talk');
}
push @out, $self->msg('talkinst');
$self->state('talk');
}
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
push @out, $self->talk_prompt;
}
push @out, $self->talk_prompt;
}