projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix swearing logging so that it is better.
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 67165ef455a03df1fcae0368bd1ba21504f5c325..f4a1b7aba0e66dd6818d288e1e229b90d03a30b3 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-346,17
+346,22
@@
sub handle_32
}
# check the message for bad words
}
# check the message for bad words
+ my @bad;
my @words;
my @words;
+ @bad = BadWords::check($ref->{subject});
+ push @words, [$ref->{subject}, @bad] if @bad;
for (@{$ref->{lines}}) {
for (@{$ref->{lines}}) {
- push @words, BadWords::check($_);
+ @bad = BadWords::check($_);
+ push @words, [$_, @bad] if @bad;
}
}
- push @words, BadWords::check($ref->{subject});
if (@words) {
if (@words) {
- dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
- Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+ dbg("$ref->{from} swore: $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
+ Log('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+ dbg("subject: $ref->{subject}");
Log('msg',"subject: $ref->{subject}");
Log('msg',"subject: $ref->{subject}");
- for (@{$ref->{lines}}) {
- Log('msg', "line: $_");
+ for (@words) {
+ dbg("line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
+ Log('msg', "line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
}
$ref->stop_msg($fromnode);
return;
}
$ref->stop_msg($fromnode);
return;
@@
-479,7
+484,7
@@
sub notify
my $ref = shift;
my $to = $ref->{to};
my $uref = DXUser->get_current($to);
my $ref = shift;
my $to = $ref->{to};
my $uref = DXUser->get_current($to);
- my $dxchan = DXChannel
->
get($to);
+ my $dxchan = DXChannel
::
get($to);
if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
if ($email) {
if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
if ($email) {