From 14172e7e59f38445d34b1a55b45e793f6ed53274 Mon Sep 17 00:00:00 2001
From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 1 Dec 2022 17:30:39 +0000
Subject: [PATCH] fix obadw check on cmd line, new words

---
 Changes               |  6 ++++--
 perl/DXCommandmode.pm | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Changes b/Changes
index fa47aee0..e2ffceb8 100644
--- 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 f6d890b1..90812225 100644
--- 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
-- 
2.43.0