diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f9440d..c2301f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ChangeLog * handle unicode characters with 3-byte UTF-8 representation correctly * calculate expected income with respect to discounts granted * report soon-expiring members in the summary emails +* report mailing lists check status in summary emails 1.15.1 ------ diff --git a/src/Makefile b/src/Makefile index f7f288c..010c646 100644 --- a/src/Makefile +++ b/src/Makefile @@ -333,7 +333,8 @@ NOTIFICATIONS-SOURCES=notifications.scm brmember.import.scm \ brmember-format.import.scm configuration.import.scm \ util-time.import.scm members-fees.import.scm mbase.import.scm \ members-print.import.scm table.import.scm \ - bank-account.import.scm logging.import.scm + bank-account.import.scm logging.import.scm \ + mailinglist.import.scm notifications.o: notifications.import.scm notifications.import.scm: $(NOTIFICATIONS-SOURCES) diff --git a/src/hackerbase.scm b/src/hackerbase.scm index d19c31c..6579723 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -396,8 +396,8 @@ (print-git-status)) ((summary) (if (-send-emails-) - (make+send-summary-email MB) - (make+print-summary-email MB))) + (make+send-summary-email MB MLS) + (make+print-summary-email MB MLS))) ((list) (for-each (lambda (mr) (print (brmember-nick mr))) diff --git a/src/notifications.scm b/src/notifications.scm index 7c13482..91e37a0 100644 --- a/src/notifications.scm +++ b/src/notifications.scm @@ -40,6 +40,7 @@ (chicken format) (chicken string) (chicken sort) + (chicken port) brmember util-mail util-bst-ldict @@ -54,7 +55,8 @@ table bank-account logging - srfi-1) + srfi-1 + mailinglist) ;; Prints email to the console (define (print-notification-email em) @@ -142,7 +144,7 @@ (send-notification-email em))) ;; Summary email of membership fees payments - (define (summary-email-body mb) + (define (summary-email-body mb mls) (let* ((mbs (members-summary mb)) (students (car mbs)) (full (cdr mbs)) @@ -175,6 +177,12 @@ (brmember-format "~N (~S)" mr)) soonexps) ","))))) + (mlcheck-lst + (string-split + (with-output-to-string + (lambda () + (print-mailing-list-checks mb mls))) + "\n")) (debtors (sort (members-to-notify mb 1) brmember