projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6. Make the scripts look for user and node_default files if there isn't a
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 5e6c722646867868d7eb47171fc0fbdab6ab9fb5..c2cab9f9bb619dc02ed6831ae9a1401b85f006af 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-30,6
+30,8
@@
use AnnTalk;
use WCY;
use Sun;
use Internet;
use WCY;
use Sun;
use Internet;
+use Script;
+
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug);
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug);
@@
-100,6
+102,7
@@
sub start
$self->{wx} = $user->wantwx;
$self->{dx} = $user->wantdx;
$self->{logininfo} = $user->wantlogininfo;
$self->{wx} = $user->wantwx;
$self->{dx} = $user->wantdx;
$self->{logininfo} = $user->wantlogininfo;
+ $self->{ann_talk} = $user->wantann_talk;
$self->{here} = 1;
# get the filters
$self->{here} = 1;
# get the filters
@@
-142,6
+145,10
@@
sub start
run_cmd($DXProt::me, "forward/opernam $call");
$user->lastoper($main::systime);
}
run_cmd($DXProt::me, "forward/opernam $call");
$user->lastoper($main::systime);
}
+
+ # run a script send the output to the punter
+ my $script = new Script(lc $call) || new Script('user_default');
+ $script->run($self) if $script;
}
#
}
#
@@
-703,6
+710,11
@@
sub announce
my $text = shift;
my ($filter, $hops);
my $text = shift;
my ($filter, $hops);
+ if (!$self->{ann_talk} && $to ne $self->{call}) {
+ my $call = AnnTalk::is_talk_candidate($_[0], $text);
+ return if $call;
+ }
+
if ($self->{annfilter}) {
($filter, $hops) = $self->{annfilter}->it(@_ );
return unless $filter;
if ($self->{annfilter}) {
($filter, $hops) = $self->{annfilter}->it(@_ );
return unless $filter;