[whimsy] branch master updated: Move pmcs away from .archives

[se...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new faf2fe0  Move pmcs away from .archives
faf2fe0 is described below

commit faf2fe078e6987facd5e528954923da72ed06c7a
Author: Sebb <se...@apache.org>
AuthorDate: Wed Feb 9 17:29:17 2022 +0000

    Move pmcs away from .archives
---
 www/roster/models/committee.rb  | 7 ++-----
 www/roster/views/pmc/main.js.rb | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 57e2494..3a471ab 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -11,10 +11,6 @@ class Committee
     # 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 =~ /^#{pmc.mail_list}\b/
-    end
-
     comdev = ASF::SVN['comdev-foundation']
     info = JSON.parse(File.read(File.join(comdev, 'projects.json')))[id]
 
@@ -47,8 +43,9 @@ class Committee
         sSubs = ASF::MLIST.security_subscribers(pmc.mail_list)[0]||[]
         unMatchedSecSubs=Set.new(sSubs) # init ready to remove matched mails
       end
+      lists = ASF::MLIST.domain_lists(pmc.mail_list, true)
     else
-      lists = lists.select {|_, mode| mode == 'public'}
+      lists = ASF::MLIST.domain_lists(pmc.mail_list, false)
     end
 
     roster = pmc.roster.dup # from committee-info
diff --git a/www/roster/views/pmc/main.js.rb b/www/roster/views/pmc/main.js.rb
index eded4b8..c5b77d5 100644
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@ -156,9 +156,7 @@ class PMC < Vue
     else
       _h2.mail! 'Mail lists'
       _ul do
-        for mail_name in @committee.mail
-          parsed = mail_name.match(/^(.*?)-(.*)/)
-          list_name = "#{parsed[2]}@#{parsed[1]}.apache.org"
+        for list_name in @committee.mail
           _li do
             _a list_name, href: 'https://lists.apache.org/list.html?' +
               list_name