From d24b7c4136d5d84be122e23a2d5328b4c021c40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Fri, 9 Feb 2024 15:05:49 +0100 Subject: [PATCH] Move more to the new mailinglist module. --- src/Makefile | 3 ++- src/hackerbase.scm | 10 +--------- src/mailinglist.scm | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/Makefile b/src/Makefile index bf542ff..f7f288c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -553,7 +553,8 @@ tiocgwinsz.o: tiocgwinsz.import.scm tiocgwinsz.import.scm: $(TIOCGWINSZ-SOURCES) MAILINGLIST-SOURCES=mailinglist.scm racket-kwargs.import.scm \ - mailman.import.scm mbase.import.scm util-string.import.scm + mailman.import.scm mbase.import.scm util-string.import.scm \ + brmember.import.scm mailinglist.o: mailinglist.import.scm mailinglist.import.scm: $(MAILINGLIST-SOURCES) diff --git a/src/hackerbase.scm b/src/hackerbase.scm index 08b9b80..d19c31c 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -287,11 +287,6 @@ (print " " (car keys) ": " (length (ldict-ref status (car keys))))) (loop (cdr keys))))))) -(define (rada-ml-pred? mr) - (or (brmember-council? mr) - (brmember-chair? mr) - (brmember-revision? mr))) - ;; Perform requested action (case (-action-) ((print-info) @@ -303,10 +298,7 @@ (let () (print-members-base-table MB) (newline) - (check-mailing-list MB MLS "internal" #:suspended #t) - (check-mailing-list MB MLS "rada" - #:pred? rada-ml-pred?) - (check-mailing-list MB MLS "rk" #:pred? brmember-revision?) + (print-mailing-list-checks MB MLS) (print-git-status))) (newline)) ((print-stats) diff --git a/src/mailinglist.scm b/src/mailinglist.scm index 9f227f4..8fa8aa8 100644 --- a/src/mailinglist.scm +++ b/src/mailinglist.scm @@ -29,6 +29,7 @@ mailinglist ( check-mailing-list + print-mailing-list-checks ) (import scheme @@ -37,7 +38,8 @@ racket-kwargs mailman mbase - util-string) + util-string + brmember) (define* (check-mailing-list MB mls name #:pred? (pred? #f) #:suspended (suspended #f)) (define ml (find-mailman-list mls name)) @@ -60,4 +62,15 @@ (when (not (null? surplus)) (print " Outsiders: " surplus)))))))) + (define (print-mailing-list-checks MB MLS) + (check-mailing-list MB MLS "internal" #:suspended #t) + (check-mailing-list MB MLS "rada" + #:pred? rada-ml-pred?) + (check-mailing-list MB MLS "rk" #:pred? brmember-revision?)) + + (define (rada-ml-pred? mr) + (or (brmember-council? mr) + (brmember-chair? mr) + (brmember-revision? mr))) + )