Merge remote-tracking branch 'upstream/main'

src/config/2024.json

@@ -43,8 +43,7 @@
           "part": "I",
           "chapter_number": "5",
           "title": "Fonts",
-          "slug": "fonts",
-          "todo": true
+          "slug": "fonts"
         },
         {
           "part": "I",

src/config/contributors.json

@@ -750,9 +750,13 @@
       "2022": [
         "analysts",
         "authors"
+      ],
+      "2024": [
+        "authors"
       ]
     },
-    "twitter": "bram_stein",
+    "mastodon": "https://typo.social/@bram",
+    "linkedin": "bramstein",
     "website": "http://www.bramstein.com/"
   },
   "clarkio": {
@@ -938,6 +942,18 @@
     "twitter": "catalinred",
     "website": "https://catalin.red/"
   },
+  "charlesberret": {
+    "avatar_url": "3780812",
+    "name": "Charles Berret",
+    "github": "cberret",
+    "website": "https://charlesberret.net/",
+    "teams": {
+      "2024": [
+        "authors",
+        "editors"
+      ]
+    }
+  },
   "huijing": {
     "avatar_url": "1461498",
     "github": "huijing",
@@ -997,6 +1013,9 @@
       ],
       "2022": [
         "reviewers"
+      ],
+      "2024": [
+        "reviewers"
       ]
     },
     "twitter": "svgeesus",
@@ -1263,6 +1282,16 @@
     },
     "twitter": "dominiclovell"
   },
+  "drott": {
+    "avatar_url": "1021784",
+    "github": "drott",
+    "name": "Dominik Röttsches",
+    "teams": {
+      "2024": [
+        "reviewers"
+      ]
+    }
+  },
   "dougsillars": {
     "avatar_url": "1514288",
     "github": "dougsillars",
@@ -1893,6 +1922,17 @@
     },
     "website": "https://sites.google.com/view/iuliacomsa/"
   },
+  "ivanukhov": {
+    "avatar_url": "57440",
+    "github": "IvanUkhov",
+    "name": "Ivan Ukhov",
+    "teams": {
+      "2024": [
+        "analysts",
+        "reviewers"
+      ]
+    }
+  },
   "SilentJMA": {
     "avatar_url": "16384750",
     "github": "SilentJMA",
@@ -2268,6 +2308,9 @@
     "teams": {
       "2022": [
         "reviewers"
+      ],
+      "2024": [
+        "reviewers"
       ]
     },
     "twitter": "jmsoleb",
@@ -2567,6 +2610,16 @@
     },
     "twitter": "Zizzamia"
   },
+  "liamquin": {
+    "avatar_url": "8258535",
+    "github": "liamquin",
+    "name": "Liam Quin",
+    "teams": {
+      "2024": [
+        "reviewers"
+      ]
+    }
+  },
   "lirantal": {
     "avatar_url": "316371",
     "github": "lirantal",
@@ -2684,6 +2737,9 @@
     "teams": {
       "2020": [
         "reviewers"
+      ],
+      "2024": [
+        "reviewers"
       ]
     },
     "twitter": "Mandy_Kerr",
@@ -3583,6 +3639,9 @@
     "teams": {
       "2020": [
         "authors"
+      ],
+      "2024": [
+        "reviewers"
       ]
     },
     "twitter": "raphlinus",

src/tools/generate/generate_rss.js

@@ -33,7 +33,7 @@ const generate_rss = async (configs, rss_chapters, rss_languages) => {
     const updatedate = get_update_date(`${language}/${year}/chapters/${chapter}.html`);
     const url = convert_file_name(`${language}/${year}/${chapter}`);
     title = `${title} (${year})`;
-    authors = authors.map(author => configs[year].contributors[author].name.replace(/\\/g, '\\\\').replace(/"/g, '\\"'));
+    authors = authors.map(author => configs[year].contributors[author]?.name?.replace(/\\/g, '\\\\')?.replace(/"/g, '\\"'));
     authors = '"' + authors.join('","') + '"';
 
     // Capture the latest updated date as the overall rss updated date

src/tools/generate/shared.js

@@ -24,13 +24,13 @@ simpleConverter.setOption('ghMentions', false);
 
 const convertSimpleMarkdown = (text) => {
   // Showdown replaces & with & so convert those back to avoid escape issues
-  let convertedText = text.replace(/&/g,'&');
+  let convertedText = text?.replace(/&/g,'&');
   convertedText = simpleConverter.makeHtml(convertedText);
   // As we've converted again, need to convert back & again
-  convertedText = convertedText.replace(/&/g,'&');
+  convertedText = convertedText?.replace(/&/g,'&');
   // Strip paragraph tags from beginning and end
-  convertedText = convertedText.replace(/^<p>/,'');
-  convertedText = convertedText.replace(/<\/p>$/,'');
+  convertedText = convertedText?.replace(/^<p>/,'');
+  convertedText = convertedText?.replace(/<\/p>$/,'');
   return convertedText;
 };