From 3ba765dac04dd441043852c1315ae57b593d1202 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Sun, 3 Dec 2023 17:31:13 -0800
Subject: [PATCH] Check the DELETE attribute before the MODERATED/VALIDATED
 attributes

---
 exec/nntpservice.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/exec/nntpservice.js b/exec/nntpservice.js
index db300d3c6a..4743c7daa0 100644
--- a/exec/nntpservice.js
+++ b/exec/nntpservice.js
@@ -713,14 +713,14 @@ while(client.socket.is_connected && !quit) {
 /* Eliminate dupe loops
 			if(user.security.restrictions&UFLAG_Q && hdr!=null)
 */
-			if(hdr.attr&MSG_MODERATED && !(hdr.attr&MSG_VALIDATED)) {
-				writeln("430 unvalidated message");
-				break;
-			}
 			if(hdr.attr&MSG_DELETE) {
 				writeln("430 deleted message");
 				break;
 			}
+			if(hdr.attr&MSG_MODERATED && !(hdr.attr&MSG_VALIDATED)) {
+				writeln("430 unvalidated message");
+				break;
+			}
 			if(hdr.attr&MSG_PRIVATE
 				&& hdr.to.toLowerCase()!=user.alias.toLowerCase()
 				&& hdr.to.toLowerCase()!=user.name.toLowerCase()) {
-- 
GitLab