fix obadw check on cmd line, new words

diff --git a/Changes b/Changes
index fa47aee0dc1e919fa88c2fd56aa1e36783aae570..e2ffceb848368f716d14d2e68c7116f577bd0d21 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,8 +5,10 @@
 2. Any line entered by a user is checked for badwords *before* being sent to
    the command processing system.
 3. All debugging for badwords has the word 'badword' in it. So that one can
-   do a 'grepdbg -2 badword' and one should see who said it and all of what
-   they said. 
+   do a 'grepdbg -1 badword' and one should see who said it and all of what
+   they said. Watchdbg will also work with this.
+4. My latest recommended additions to the badword list includes:
+   RU STOP SPOT DISGRACE CRM CRIM CRUD SUBHUMAN FASCIST DEGENERATE CATTLE CNT
 23Nov22=======================================================================
 1. The BadWord system has been rewritten. This change is pretty radical and
    needs to be used with care as a word that is entered will be reduced to the

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index f6d890b17c5919eb74254854fa7d77aea04b1c9f..90812225dfe772c4bd8b2671f6ff3600bc70a521 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -348,7 +348,7 @@ sub normal
                        my $sendit = $cmdline =~ s|^/+||;
                        if (@bad = BadWords::check($cmdline)) {
                                $self->badcount(($self->badcount||0) + @bad);
-                               LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with words: '" . join(',', @bad) . "'");
+                               LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
                        } else {
                                my @in = $self->run_cmd($cmdline);
                                $self->send_ans(@in);
@@ -369,7 +369,7 @@ sub normal
                        # send what has been said to whoever is in this person's talk list
                        if (@bad = BadWords::check($cmdline)) {
                                $self->badcount(($self->badcount||0) + @bad);
-                               LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with words: '" . join(',', @bad) . "'");
+                               LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
                        } else {
                                for (@{$self->{talklist}}) {
                                        if ($self->{state} eq 'talk') {
@@ -401,12 +401,12 @@ sub normal
                }
                $self->send_ans(@ans);
        } else {
-               if (@bad = BadWords::check($cmdline)) {
-                       $self->badcount(($self->badcount||0) + @bad);
-                       LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with words: '" . join(',', @bad) . "'");
-               } else {
+#              if (@bad = BadWords::check($cmdline)) {
+#                      $self->badcount(($self->badcount||0) + @bad);
+#                      LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+#              } else {
                        $self->send_ans(run_cmd($self, $cmdline));
-               }
+#              }
        } 
 
        # check for excessive swearing