From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 14 Mar 2026 22:13:46 +0000 (+0100)
Subject: selfmoderate: backout better served by subrelease
X-Git-Tag: RELEASE_1_8_0~2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=130d202b1dcee941b8be73358169f5cdff86d8a6;p=thirdparty%2Fmlmmj.git

selfmoderate: backout better served by subrelease
---

diff --git a/TUNABLES.md b/TUNABLES.md
index 99839610..295390e0 100644
--- a/TUNABLES.md
+++ b/TUNABLES.md
@@ -135,12 +135,6 @@ entire content is used as value, it's marked "text".
    If this file is present, the poster (based on the envelope from) will
    get a mail when their post is being moderated.
 
- * selfmoderate		(boolean)
-
-   If this file is present, moderation emails for posts are sent to the
-   original sender instead of the moderators. Only affects moderated lists.
-   Has no effect on non-moderated lists.
-
  * digestinterval		(normal)
 
    This file specifies how many seconds will pass before the next digest is
diff --git a/listtexts/ast/moderate-post b/listtexts/ast/moderate-post
index 6965955e..fb4016d5 100644
--- a/listtexts/ast/moderate-post
+++ b/listtexts/ast/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Se recibió un mensaxe de <$posteraddr$> col asuntu "$subject$" unviáu
 pa espublizar. Te pedimos que lu moderes
-%ifreason selfmoderated%
-  porque yes el remitente y nun tas subscriptor.
-%endif%
 %ifreason modnonsubposts%
   porque'l remitente nun ye suscriptor.
 %endif%
@@ -32,10 +29,8 @@ de vezu val con simplemente responder a esti mensaxe.
 %wrap%Si nun quies facer denguna d'estes coses, o manda un mensaxe a
 <$rejectaddr$> o simplemente salta esti mensaxe.
 
-%ifnreason selfmoderated%
 Recibieron esti corréu los siguientes moderadores:
 - %moderators%
-%%endif
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/cs/moderate-post b/listtexts/cs/moderate-post
index 5fe5b819..a011ad20 100644
--- a/listtexts/cs/moderate-post
+++ b/listtexts/cs/moderate-post
@@ -11,9 +11,6 @@ Content-Transfer-Encoding: 8bit
 %text prologue%
 
 %wrap%Zpráva od <$posteraddr$> s předmětem "$subject$" byla zaslána a nastal požadavek na moderování,
-%ifreason selfmoderated%
-  protože jsi odesílatel a nejsi konference.
-%endif%
 %ifreason modnonsubposts%
   protože odesílatel není členem konference.
 %endif%
@@ -31,10 +28,8 @@ což lze většinou udělat jen odpovědí na tento emailový požadavek.
 %wrap%Pokud nechcete zprávu odeslat, zašlete zprávu na <$rejectaddr$>, 
 nebo prostě jednoduše tento email ignorujte.
 
-%ifnreason selfmoderated%
 Následující moderátoři obrželi tento požadavek:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/de/moderate-post b/listtexts/de/moderate-post
index 8291e328..2762d44e 100644
--- a/listtexts/de/moderate-post
+++ b/listtexts/de/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Eine Nachricht von <$posteraddr$> mit dem Betreff "$subject$" wurde an
 die Liste geschickt. Sie sollten die Nachricht moderieren,
-%ifreason selfmoderated%
-  weil du der Absender bist und nicht Abonnent bist.
-%endif%
 %ifreason modnonsubposts%
   da der Absender kein Abonnent ist.
 %endif%
@@ -33,10 +30,8 @@ diese Nachricht.
 %wrap%Wenn Sie nichts davon ausführen möchten, Senden Sie eine Mail an
 <$rejectaddr$> oder ignorieren Sie einfach diese Mail.
 
-%ifnreason selfmoderated%
 Folgende Moderatoren haben diese Mail erhalten:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/en/moderate-post b/listtexts/en/moderate-post
index 58e4d426..9c947979 100644
--- a/listtexts/en/moderate-post
+++ b/listtexts/en/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%A message from <$posteraddr$> with subject "$subject$" has been
 submitted for posting. You are being asked to moderate
-%ifreason selfmoderated%
-  because you are the requester and not subscribed.
-%endif%
 %ifreason modnonsubposts%
   because the requester is not a subscriber.
 %endif%
@@ -32,10 +29,8 @@ which can usually be done simply by replying to this message.
 %wrap%If you do not want to do any of this, either send a message to
 <$rejectaddr$> or simply ignore this message.
 
-%ifnreason selfmoderated%
 The following moderators have received this mail:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/fi/moderate-post b/listtexts/fi/moderate-post
index 6a9d3028..743a4ceb 100644
--- a/listtexts/fi/moderate-post
+++ b/listtexts/fi/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Viesti osoitteesta <$posteraddr$> otsikolla "$subject$" on lähetetty
 listalle välitettäväksi. Sinua pyydetään moderoimaan viesti, koska
-%ifreason selfmoderated%
- Koska olet lähettäjä etkä ole tilaaja.
-%endif%
 %ifreason modnonsubposts%
   viestin lähettäjä ei ole listan tilaaja.
 %endif%
@@ -32,10 +29,8 @@ Viesti on luettavissa alla.
 %wrap%Jos et halua viestiä hyväksyttävän, lähetä viesti osoitteeseen
 <$rejectaddr$> tai jätä tämä viesti kokonaan huomioimatta.
 
-%ifnreason selfmoderated%
 Seuraavat moderaattorit ovat saaneet tämän viestin:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/fr/moderate-post b/listtexts/fr/moderate-post
index e47f0d66..f2ac6f25 100644
--- a/listtexts/fr/moderate-post
+++ b/listtexts/fr/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Un message de <$posteraddr$> ayant pour sujet "$subject$" a été soumis
 pour envoi. Il vous est demandé de le modérer 
-%ifreason selfmoderated%
-  parce que vous êtes le demandeur et n'êtes pas inscrit.
-%endif%
 %ifreason modnonsubposts%
   parce que le demandeur n'est pas inscrit.
 %endif%
@@ -33,10 +30,8 @@ Le message est ci-dessous.
 %wrap%Si vous ne souhaitez faire aucune de ces actions, vous pouvez envoyer
 un message à <$rejectaddr$> ou simplement ignorer ce message.
 
-%ifnreason selfmoderated%
 Les modérateurs suivants ont reçu ce mail :
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/gr/moderate-post b/listtexts/gr/moderate-post
index cf830877..62510836 100644
--- a/listtexts/gr/moderate-post
+++ b/listtexts/gr/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Το μήνυμα με αποστολέα <$posteraddr$> και θέμα "$subject$" πρέπει να
 ελεγχθεί πριν τη δημοσίευσή του
-%ifreason selfmoderated%
-  Επειδή είσαι ο αποστολέας και δεν είσαι εγγεγραμμένος.
-%endif%
 %ifreason modnonsubposts%
   καθώς ο αποστολέας του μηνύματος δεν είναι εγγεγραμμένος στη λίστα.
 %endif%
@@ -33,10 +30,8 @@ Content-Transfer-Encoding: 8bit
 %wrap%Αν δεν επιθυμείτε να κάνετε τίποτα από τα παραπάνω τότε στείλτε ένα
 μήνυμα στο <$rejectaddr$> ή απλά αγνοήστε το μήνυμα αυτό.
 
-%ifnreason selfmoderated%
 Το μήνυμα αυτό απεστάλη στους παρακάτω διαχειριστές :
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/it/moderate-post b/listtexts/it/moderate-post
index ee02cb9d..2fe324cd 100644
--- a/listtexts/it/moderate-post
+++ b/listtexts/it/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%È stato inviato un messaggio da <$posteraddr$> con oggetto
 "$subject$". Ti è stato richiesto di moderarlo
-%ifreason selfmoderated%
-  perché siete il richiedente e non siete inscritto/a.
-%endif%
 %ifreason modnonsubposts%
   perché il/la richiedente non è un/a iscritto/a.
 %endif%
diff --git a/listtexts/pt/moderate-post b/listtexts/pt/moderate-post
index 09a3459b..48300380 100644
--- a/listtexts/pt/moderate-post
+++ b/listtexts/pt/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%A mensagem de <$posteraddr$> com o assunto "$subject$" foi enviada
 para publicação. Esta mensagem requer moderação
-%ifreason selfmoderated%
-  porque és o remetente e não estás subscriptor.
-%endif%
 %ifreason modnonsubposts%
   porque o remetente não é um subscritor.
 %endif%
@@ -32,10 +29,8 @@ bastando, para o efeito, responder a esta mensagem.
 %wrap%Se não o quiser fazer, envie uma mensagem para <$rejectaddr$> ou
 ignore esta mensagem.
 
-%ifnreason selfmoderated%
 Os seguintes moderadores receberam esta mensagem:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/sk/moderate-post b/listtexts/sk/moderate-post
index ae47a6d7..92ee251b 100644
--- a/listtexts/sk/moderate-post
+++ b/listtexts/sk/moderate-post
@@ -12,9 +12,6 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%Od <$posteraddr$> bola na zverejnenie doručená správa s predmetom
 "$subject$". Žiadame Vás o jej preverenie,
-%ifreason selfmoderated%
-  lebo si odosielateľ a nie si abonentom.
-%endif%
 %ifreason modnonsubposts%
   lebo jej odosielateľ nie je abonentom diskusie.
 %endif%
@@ -32,10 +29,8 @@ Správa je pripojená nižšie.
 %wrap%Ak nechcete vykonať žiadnu z týchto akcií, pošlite mail na
 <$rejectaddr$> alebo jednoducho túto správu ignorujte.
 
-%ifnreason selfmoderated%
 Túto správu dostali nasledujúci moderátori:
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/listtexts/zh-cn/moderate-post b/listtexts/zh-cn/moderate-post
index cfa22b32..14b42536 100644
--- a/listtexts/zh-cn/moderate-post
+++ b/listtexts/zh-cn/moderate-post
@@ -11,9 +11,6 @@ Content-Transfer-Encoding: 8bit
 %text prologue%
 
 %wrap%来自 <$posteraddr$> 题为《\=$subject$\=》的邮件已提交发布\=。
-%ifreason selfmoderated%
-  因为你是发件人，并且你没有订阅。，
-%endif%
 %ifreason modnonsubposts%
   由于请求者不是订户\=，
 %endif%
@@ -30,10 +27,8 @@ Content-Transfer-Encoding: 8bit
 
 %wrap%如果您不打算通过\=，请发邮件到 <$rejectaddr$> 或直接忽略本邮件\=。
 
-%ifnreason selfmoderated%
 本邮件已发给下述版主\=：
 - %moderators%
-%endif%
 
 --=_$random0$$random1$_=
 Content-Type: message/rfc822
diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index 099f12dd..56fe5133 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -60,8 +60,7 @@ enum modreason {
 	MODNONSUBPOSTS,
 	MODNONMODPOSTS,
 	ACCESS,
-	MODERATED,
-	SELFMODERATED
+	MODERATED
 };
 
 
@@ -69,8 +68,7 @@ static char *modreason_strs[] = {
 	"modnonsubposts",
 	"modnonmodposts",
 	"access",
-	"moderated",
-	"selfmoderated"
+	"moderated"
 };
 
 static void
@@ -159,7 +157,6 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
 	const char *efromismod = NULL;
 	const char *mailbasename = mybasename(mailfilename);
 	int notifymod = 0;
-	bool selfmoderate = 0;
 #if 0
 	printf("mailfilename = [%s], mailbasename = [%s]\n", mailfilename,
 			                                     mailbasename);
@@ -181,14 +178,7 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
 
 	gen_addr(from, ml, "owner");
 
-	selfmoderate = statctrl(ml->ctrlfd, "selfmoderate");
-
-	if (selfmoderate) {
-		to = xstrdup(posteraddr);
-		modreason = SELFMODERATED;
-	} else {
-		xasprintf(&to, "%s-moderators@%s", ml->name, ml->fqdn);
-	}
+	xasprintf(&to, "%s-moderators@%s", ml->name, ml->fqdn);
 
 	txt = open_text(ml->fd, "moderate", "post",
 			modreason_strs[modreason], NULL, "moderation");
@@ -260,11 +250,6 @@ static void newmoderated(struct ml *ml, const char *mailfilename,
 		exit(EXIT_SUCCESS);
 	}
 
-	if (selfmoderate) {
-		send_mail_from_file(ml, from, to, queuefilename);
-		exit(EXIT_SUCCESS);
-	}
-
 	exec_or_die(mlmmjsend, "-l", "2", "-L", ml->dir, "-F", from,
 	    "-m", queuefilename, NULL);
 }
diff --git a/tests/mlmmj-receive.in b/tests/mlmmj-receive.in
index 7c43ffb5..2be02f25 100644
--- a/tests/mlmmj-receive.in
+++ b/tests/mlmmj-receive.in
@@ -19,8 +19,6 @@ tests_init \
 	subscription_moderation \
 	moderation \
 	moderation_autosubscribe \
-	moderation_selfmoderate \
-	moderation_selfmoderate_autosubscribe \
 	moderation_notifymod \
 	moderation_notmetoo \
 	moderation_reject_invalid \
@@ -1834,12 +1832,6 @@ EOF
 }
 
 moderation_init_body() {
-	if [ $# -eq 1 ]; then
-		moderator="$1"
-	else
-		moderator="test-moderators@mlmmjtest"
-	fi
-
 	init_ml list
 	rmdir list/text
 	ln -s ${top_srcdir}/listtexts/en list/text
@@ -1853,15 +1845,8 @@ moderation_init_body() {
 }
 
 moderation_test_body() {
-	if [ $# -eq 1 ]; then
-		moderator="$1"
-		rcpto="$1"
-		self=1
-	else
-		moderator="test-moderators@mlmmjtest"
-		rcpto="me@modos"
-		self=0
-	fi
+	moderator="test-moderators@mlmmjtest"
+	rcpto="me@modos"
 
 cat > first <<EOF
 From: bob@test
@@ -1894,19 +1879,8 @@ Content-Transfer-Encoding: 8bit
 Hi, this is the Mlmmj program managing the <test@mlmmjtest> mailing list.
 
 A message from <bob@test> with subject "yeah" has been submitted for
-EOF
-	if [ $self -eq 0 ]; then
-	cat >> expected-1.txt <<EOF
 posting. You are being asked to moderate because this is a moderated list.
 The message is below.
-EOF
-	else
-cat >> expected-1.txt <<EOF
-posting. You are being asked to moderate because you are the requester and
-not subscribed. The message is below.
-EOF
-	fi
-	cat >> expected-1.txt <<EOF
 
 To release it to the list, please send a message to
 <test+release-@mlmmjtest> which can usually be done simply
@@ -1915,14 +1889,10 @@ by replying to this message.
 If you do not want to do any of this, either send a message to
 <test+reject-@mlmmjtest> or simply ignore this message.
 
-EOF
-	if [ $self -eq 0 ]; then
-	cat >> expected-1.txt <<EOF
 The following moderators have received this mail:
 - me@modos
 
 EOF
-	fi
 	cat >> expected-1.txt <<EOF
 --=boundary=
 Content-Type: message/rfc822
@@ -2003,20 +1973,6 @@ moderation_autosubscribe_body() {
 }
 
 
-moderation_selfmoderate_body() {
-	moderation_init_body bob@test
-	atf_check touch list/control/selfmoderate
-	moderation_test_body bob@test
-}
-
-moderation_selfmoderate_autosubscribe_body() {
-	moderation_init_body bob@test
-	touch list/control/selfmoderate
-	touch list/control/autosubscribe
-	moderation_test_body bob@test
-	atf_check -o inline:"bob@test\n" cat list/nomailsubs.d/b
-}
-
 moderation_notifymod_body() {
 	init_ml list
 	rmdir list/text