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 ea588076 User id can contain - and _
ea588076 is described below

commit ea5880764bee4a60af6d71acded8eb0ba65cc750
Author: Sebb <[email protected]>
AuthorDate: Sun Mar 10 12:55:44 2024 +0000

    User id can contain - and _
---
 www/secretary/workbench/views/memapp.json.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/memapp.json.rb 
b/www/secretary/workbench/views/memapp.json.rb
index 1255edef..07cd8e7d 100644
--- a/www/secretary/workbench/views/memapp.json.rb
+++ b/www/secretary/workbench/views/memapp.json.rb
@@ -5,7 +5,12 @@ meetings = ASF::SVN['Meetings']
 received = Dir["#{meetings}/2*/memapp-received.txt"].max
 
 # extract contents
-pattern = /^\w+\s+(\w+)\s+(\w+)\s+(\w+)\s+(\w+)\s+(.*?)\s*\n/
+# Sample
+# Invite? Applied? members@? Karma? ID              Name
+# ------- -------- --------- ------ --------------- ------------------
+# yes     no       no        no     user-id_        User name
+# N.B. user id can contain - and _
+pattern = /^\w+\s+(\w+)\s+(\w+)\s+(\w+)\s+([a-z][a-z_0-9-]+)\s+(.*?)\s*\n/
 if Date.today - Date.parse(received[/\d{8}/]) <= 32
   table = File.read(received).scan(pattern)
 else

Reply via email to