From 1f326ccd6a0755084deb30eb569dc6251a07d407 Mon Sep 17 00:00:00 2001 From: minima Date: Mon, 22 Jan 2007 14:29:17 +0000 Subject: [PATCH] add talk command --- cmd/talk.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/talk.pl b/cmd/talk.pl index 66d3cd2c..a4c9e319 100644 --- a/cmd/talk.pl +++ b/cmd/talk.pl @@ -33,9 +33,12 @@ $via = uc $via if $via; my $call = $via ? $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('e7', $call)) unless $dxchan; return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias; +# 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) { @@ -44,7 +47,7 @@ if ($line) { $self->badcount(($self->badcount||0) + @bad); LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")"); } else { - $dxchan->talk($self->call, $to, $via, $line) if $dxchan; + $main::me->normal(DXProt::pc93($to, $self->call, $via, $line)); } } else { my $s = $to; @@ -52,13 +55,13 @@ if ($line) { 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 ]); - $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'); } -- 2.34.1