X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=dae38e243be0d56b8f1378fd57e8f4bcf067e28b;hb=4b207544da78b182bd12e94eab01451694749012;hp=ced47037b901b6951ec62f22fd323cb7a9254784;hpb=bd14b9e29dbd64a441cc7b65f6b6b92717f8a01b;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index ced47037..dae38e24 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -1,54 +1,80 @@
 #
-# The talk command
+# The talk command (improved)
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
-my ($self, $line) = @_;
-my @argv = split /\s+/, $line;	# generate an argv
-my $to = uc $argv[0];
+my ($self, $inline) = @_;
+my $to;
 my $via;
-my $from = $self->call();
+my $line;
+my $from = $self->call;
 my @out;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 
-# have we a callsign and some text?
-return (1, $self->msg('e8')) if @argv < 2;
+# analyse the line there are four situations...
+# 1) talk call
+# 2) talk call <text>
+# 3) talk call>node 
+# 4) talk call>node text
+#
 
-if ($argv[1] eq '>') {
-	$via = uc $argv[2];
-	$line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
+($to, $via, $line) = $inline =~ /^\s*([A-Za-z0-9\-]+)\s*>([A-Za-z0-9\-]+)(.*)$/;
+if ($via) {
+	$line =~ s/\s+// if $line;
 } else {
-	$line =~ s/^$argv[0]\s*//;
+	($to, $line) = split /\s+/, $inline, 2;  
 }
 
-my $call = $via ? $via : $to;
-my $ref = DXCluster->get($call);
+return (1, $self->msg('e8')) unless $to;
 
-# if we haven't got an explicit via and we can't see them, try their node
-unless ($ref || $via) {
-	my $user = DXUser->get($call);
-	$ref = DXCluster->get_exact($user->node) if $user;
-	if ($ref) {
-		$via = $user->node;
-		push @out, "trying via $via..";
-	}
-}
-return (1, "$call not visible on the cluster") if !$ref;
+$to = uc $to;
+
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
 
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
+$via = uc $via if $via;
+my $call = $via || $to;
+my $clref = Route::get($call);     # try an exact call
+my $dxchan = $clref->dxchan if $clref;
+push @out, $self->msg('e7', $call) unless $dxchan;
 
-my $dxchan = DXCommandmode->get($to); # is it for us?
-if ($dxchan && $dxchan->is_user) {
-	$dxchan->send("$to de $from $line") if $dxchan->talk;
-	Log('talk', $to, $from, $main::mycall, $line);
+#$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;
+	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 {
+		$main::me->normal(DXProt::pc93($to, $self->call, $via, $line));
+	}
 } else {
-	$line =~ s/\^//og;			# remove any ^ characters
-	my $prot = DXProt::pc10($from, $to, $via, $line);
-	DXProt::route(undef,$via?$via:$to, $prot);
-	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	my $s = $to;
+	$s .= ">$via" if $via && $via ne '*';
+	my $ref = $self->talklist;
+	if ($ref) {
+		unless (grep { $_ eq $s } @$ref) {
+			$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+			$self->state('talk');
+			push @$ref, $s;
+		}
+	} else { 
+		$self->talklist([ $s ]);
+		$main::me->normal(DXProt::pc93($to, $self->call, $via, $self->msg('talkstart')));
+		push @out, $self->msg('talkinst');
+		$self->state('talk');
+	}
+	Log('talk', $to, $from, '>' . ($via || ($dxchan && $dxchan->call) || '*'), $self->msg('talkstart'));
+	push @out, $self->talk_prompt;
 }
 
 return (1, @out);