#
-# The talk command
+# The talk command (improved)
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
my ($self, $inline) = @_;
($to, $line) = split /\s+/, $inline, 2;
}
-$to = uc $to if $to;
+return (1, $self->msg('e8')) unless $to;
+
+$to = uc $to;
+
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+
$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;
-#return (1, $self->msg('e7', $call)) unless $dxchan;
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+push @out, $self->msg('e7', $call) unless $dxchan;
+
+#$DB::single = 1;
# default the 'via'
-$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;
+ 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 {
my $s = $to;
- $s .= ">$via" if $via;
+ $s .= ">$via" if $via && $via ne '*';
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
push @out, $self->msg('talkinst');
$self->state('talk');
}
+ Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
push @out, $self->talk_prompt;
}