diff --git a/src/hackerbase.scm b/src/hackerbase.scm index 24552d1..fcaa90a 100644 --- a/src/hackerbase.scm +++ b/src/hackerbase.scm @@ -288,23 +288,24 @@ (define* (check-mailing-list mls name #:pred? (pred? #f)) (define ml (find-mailman-list mls name)) - (let-values (((missing surplus) - (mailman-compare-members ml - (mbase-active-emails MB - #:suspended #t - #:pred? pred? - )))) - (if (null? (cdr ml)) - (print "Skipping ML check - not loaded") - (if (and (null? missing) - (null? surplus)) - (print (format "~a mailing list membership in sync." (string-capitalize name))) - (let () - (print (format "~a mailing list:" (string-capitalize name))) - (when (not (null? missing)) - (print " Missing: " missing)) - (when (not (null? surplus)) - (print " Outsiders: " surplus))))))) + (when ml + (let-values (((missing surplus) + (mailman-compare-members ml + (mbase-active-emails MB + #:suspended #t + #:pred? pred? + )))) + (if (null? (cdr ml)) + (print "Skipping ML check - not loaded") + (if (and (null? missing) + (null? surplus)) + (print (format "~a mailing list membership in sync." (string-capitalize name))) + (let () + (print (format "~a mailing list:" (string-capitalize name))) + (when (not (null? missing)) + (print " Missing: " missing)) + (when (not (null? surplus)) + (print " Outsiders: " surplus)))))))) (define (rada-ml-pred? mr) (or (brmember-council? mr) diff --git a/src/members-fees.scm b/src/members-fees.scm index a77affd..7fe3dc8 100644 --- a/src/members-fees.scm +++ b/src/members-fees.scm @@ -122,19 +122,21 @@ ;; Converts the entry into the fee (define (member-calendar-entry->fee e) - (if e - (if (member 'existing (cadr e)) - (if (member 'suspended (cadr e)) - 0 ; Suspended - (if (member 'destroyed (cadr e)) - 0 ; Destroyed - (if (member 'student (cadr e)) - (lookup-member-fee 'student) ; Student - (if (caddr e) - (caddr e) - (lookup-member-fee 'regular))))) ; Normal - 0) ; Nonexistent - should not happen - 0)) ; Nonexistent + (with-current-month + (car e) + (if e + (if (member 'existing (cadr e)) + (if (member 'suspended (cadr e)) + 0 ; Suspended + (if (member 'destroyed (cadr e)) + 0 ; Destroyed + (if (member 'student (cadr e)) + (lookup-member-fee 'student) ; Student + (if (caddr e) + (caddr e) + (lookup-member-fee 'regular))))) ; Normal + 0) ; Nonexistent - should not happen + 0))) ; Nonexistent ;; Converts the calendar into a table where rows represent years and ;; contain the year in the first cell and 12 cells for months after diff --git a/src/texts.scm b/src/texts.scm index 6108737..fbcb67e 100644 --- a/src/texts.scm +++ b/src/texts.scm @@ -39,7 +39,7 @@ (chicken format)) ;; Short banner - (define banner-line "HackerBase 1.15 (c) 2023 Brmlab, z.s.") + (define banner-line "HackerBase 1.15.1 (c) 2023 Brmlab, z.s.") ;; Banner source with numbers for ANSI CSI SGR (define banner-source "