X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=ebd762ff1630e55d5df003657db69270fc2fb87a;hb=a0c3717faf81e3b6bd62d9f4e8d4568f46067ed7;hp=a4c9e319c58a19cf91452050df4a53723a339154;hpb=1f326ccd6a0755084deb30eb569dc6251a07d407;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index a4c9e319..ebd762ff 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -30,19 +30,22 @@ 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;
 #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 ||= '*';
+#$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) . ")");
@@ -51,7 +54,7 @@ if ($line) {
 	}
 } 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) {
@@ -65,6 +68,7 @@ if ($line) {
 		push @out, $self->msg('talkinst');
 		$self->state('talk');
 	}
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
 	push @out, $self->talk_prompt;
 }