projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove shadow $i
[spider.git]
/
cmd
/
talk.pl
diff --git
a/cmd/talk.pl
b/cmd/talk.pl
index 9cdd1c58bde99deeca39e9a488dd3194e24b9345..8082e240ae0c5ac1092115df068feaaa525b6814 100644
(file)
--- a/
cmd/talk.pl
+++ b/
cmd/talk.pl
@@
-12,6
+12,7
@@
my $via;
my $line;
my $from = $self->call;
my @out;
my $line;
my $from = $self->call;
my @out;
+return (1, $self->msg('e5')) if $self->remotecmd;
# analyse the line there are four situations...
# 1) talk call
# analyse the line there are four situations...
# 1) talk call
@@
-37,9
+38,14
@@
return (1, $self->msg('e7', $call)) unless $dxchan;
# if there is a line send it, otherwise add this call to the talk list
# and set talk mode for command mode
if ($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)) {
+ return (1, $self->msg('e17', @bad));
+ }
$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
} else {
$dxchan->talk($self->call, $to, $via, $line) if $dxchan;
} else {
- my $s = "$to>" . $dxchan->call;
+ my $s = $to;
+ $s .= ">$via" if $via;
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {
my $ref = $self->talklist;
if ($ref) {
unless (grep { $_ eq $s } @$ref) {