X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Ftalk.pl;h=9b7d359d3d6323aff40889ddbe13e4069b28c4a7;hb=c4f04ae165fdc765f3baa26fa2b28b52cf967674;hp=a53b213e1f756a07e7e340dc32c7e22fe41b2e8a;hpb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;p=spider.git

diff --git a/cmd/talk.pl b/cmd/talk.pl
index a53b213e..9b7d359d 100644
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -6,33 +6,62 @@
 # $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;
 
-if ($argv[1] eq '>') {
-  $via = uc $argv[2];
-  $line =~ s/^$argv[0]\s+>\s+$argv[2]\s*//;
+# analyse the line there are four situations...
+# 1) talk call
+# 2) talk call <text>
+# 3) talk call>node 
+# 4) talk call>node text
+#
+
+($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;  
 }
 
+$to = uc $to if $to;
+$via = uc $via if $via;
 my $call = $via ? $via : $to;
-my $ref = DXCluster->get($call);
-return (1, "$call not visible on the cluster") if !$ref;
+my $clref = Route::get($call);     # try an exact call
+my $dxchan = $clref->dxchan if $clref;
+return (1, $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");
-  Log('talk', $to, $from, $main::mycall, $line);
+# 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 (@bad = BadWords::check($line)) {
+		$self->badcount(($self->badcount||0) + @bad);
+		return (1, $self->msg('e17', @bad));
+	}
+	$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 } else {
-  $line =~ s/\^//og;            # remove any ^ characters
-  my $prot = DXProt::pc10($from, $to, $via, $line);
-  DXProt::route($via?$via:$to, $prot);
-  Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	my $s = $to;
+	$s .= ">$via" if $via;
+	my $ref = $self->talklist;
+	if ($ref) {
+		unless (grep { $_ eq $s } @$ref) {
+			$dxchan->talk($self->call, $to, $via, $self->msg('talkstart'));
+			$self->state('talk');
+			push @$ref, $s;
+		}
+	} else { 
+		$self->talklist([ $s ]);
+		$dxchan->talk($self->call, $to, $via, $self->msg('talkstart'));
+		push @out, $self->msg('talkinst');
+		$self->state('talk');
+	}
+	push @out, $self->talk_prompt;
 }
 
-return (1, ());
+return (1, @out);