This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit c23675f5d063427571a392d239c641f6ac3d16af Author: Sebb <[email protected]> AuthorDate: Wed Feb 9 15:59:55 2022 +0000 Move nonpmcs away from .archives --- www/roster/models/nonpmc.rb | 7 ++----- www/roster/views/nonpmc/main.js.rb | 8 +------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/www/roster/models/nonpmc.rb b/www/roster/models/nonpmc.rb index bce96b7..06d05c2 100644 --- a/www/roster/models/nonpmc.rb +++ b/www/roster/models/nonpmc.rb @@ -15,10 +15,6 @@ class NonPMC # We'll be needing the mail data later ASF::Person.preload(['cn', 'mail', 'asf-altEmail', 'githubUsername'], (members + committers).uniq) - lists = ASF::Mail.lists(true).select do |list, _| - list =~ /^#{mail_list}\b/ - end - image = ASF::SiteImage.find(id) moderators = nil @@ -48,8 +44,9 @@ class NonPMC sSubs = ASF::MLIST.security_subscribers(mail_list)[0]||[] unMatchedSecSubs = Set.new(sSubs) # init ready to remove matched mails end + lists = ASF::MLIST.domain_lists(mail_list, true) else - lists = lists.select {|_, mode| mode == 'public'} + lists = ASF::MLIST.domain_lists(mail_list, false) end roster = cttee.roster.dup diff --git a/www/roster/views/nonpmc/main.js.rb b/www/roster/views/nonpmc/main.js.rb index ceaaa9b..ccbca68 100644 --- a/www/roster/views/nonpmc/main.js.rb +++ b/www/roster/views/nonpmc/main.js.rb @@ -143,13 +143,7 @@ class NonPMC < Vue else _h2.mail! 'Mail lists' _ul do - for mail_name in @nonpmc.mail - if mail_name.include? '-' - parsed = mail_name.match(/^(.*?)-(.*)/) - list_name = "#{parsed[2]}@#{parsed[1]}.apache.org" - else - list_name = "#{mail_name}@apache.org" - end + for list_name in @nonpmc.mail _li do _a list_name, href: 'https://lists.apache.org/list.html?' + list_name
