From 0f76514a46ad8e4b9c63d2ad9a1d74b207d7552e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Thu, 6 Apr 2023 19:46:33 +0200
Subject: [PATCH] Actually merge the emails into base.

---
 src/bbstool.scm      |  8 +++++++-
 src/mailman.scm      |  5 ++++-
 src/members-base.scm | 22 ++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/bbstool.scm b/src/bbstool.scm
index 496e7a3..cd44d13 100644
--- a/src/bbstool.scm
+++ b/src/bbstool.scm
@@ -153,7 +153,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   (newline))
 
 ;; Load the members database (required for everything anyway)
-(define MB
+(define MB0
   (if (-action-)
       (let ((mb (load-members (*members-directory*) #t)))
 	(if (-needs-bank-)
@@ -161,6 +161,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	    mb))
       #f))
 
+;; Load ML(s)
+(define internal-ml (load-mailman-list "internal"))
+
+;; Merge
+(define MB (members-base-merge-mailman MB0 internal-ml))
+
 ;; If a member is specified by either id or nick, get its record
 (define mr
   (if (-member-id-)
diff --git a/src/mailman.scm b/src/mailman.scm
index a5c427b..3a7875e 100644
--- a/src/mailman.scm
+++ b/src/mailman.scm
@@ -31,6 +31,7 @@
   *mailman-bin*
   list-mailman-lists
   list-mailman-list-members
+  load-mailman-list
   load-mailman-lists
   find-mailman-list
   mailman-list-name
@@ -78,7 +79,9 @@
  (define mailman-list-name car)
  (define mailman-list-members cdr)
 
- ;; Loads a single mailman list as mailman structure
+ ;; Loads a single mailman list as mailman structure, if
+ ;; unsuccessfull, returns only a list with ML name and no member
+ ;; emails.
  (define (load-mailman-list name)
    (make-mailman-list name
 		      (list-mailman-list-members name)))
diff --git a/src/members-base.scm b/src/members-base.scm
index 06b3ae4..2c717f7 100644
--- a/src/members-base.scm
+++ b/src/members-base.scm
@@ -244,15 +244,17 @@
     string-ci<?))
 
  ;; Merges given ML members into members base
- (define (members-base-merge-mailman mb listname emails)
-   (foldl (lambda (mb email)
-	    (members-base-update mb
-				 (lambda (mr)
-				   (equal? (member-record-info 'mail)
-					   email))
-				 (lambda (mr)
-				   (member-record-add-mailman mr listname))))
-	  mb
-	  emails))
+ (define (members-base-merge-mailman mb ml)
+   (let ((listname (car ml))
+	 (emails (cdr ml)))
+     (foldl (lambda (mb email)
+	      (members-base-update mb
+				   (lambda (mr)
+				     (equal? (member-record-info 'mail)
+					     email))
+				   (lambda (mr)
+				     (member-add-mailman mr listname))))
+	    mb
+	    emails)))
 
  )