Merge branch 'main' into main

domains/polls.json

@@ -1,9 +0,0 @@
-{
-  "owner": {
-    "username": "Yunexiz",
-    "discord": "1040303561847881729"
-  },
-  "record": {
-    "URL": "https://y.is-a.dev"
-  }
-}

domains/rdap.json

@@ -1,9 +0,0 @@
-{
-  "owner": {
-    "username": "rdaphq",
-    "email": "rdapshii@gmail.com"
-  },
-  "record": {
-    "A": ["156.67.73.46"]
-  }
-}

tests/json.test.js

@@ -30,7 +30,7 @@ const optionalRedirectConfigFields = {
 const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
 const hostnameRegex = /^(?=.{1,253}$)(?:(?:[_a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)\.)+[a-zA-Z]{2,63}$/;
 
-const exceptedDomains = require("../util/excepted.json");
+const excludedDomains = require("../util/excluded.json");
 const reservedDomains = require("../util/reserved.json");
 const domainsPath = path.resolve("domains");
 const files = fs.readdirSync(domainsPath);
@@ -113,7 +113,7 @@ async function validateFileName(t, file) {
 
         const rootSubdomain = subdomain.split(".").pop();
 
-        if (!exceptedDomains.includes(rootSubdomain)) {
+        if (!excludedDomains.includes(rootSubdomain)) {
             t.false(rootSubdomain.startsWith("_"), `${file}: Root subdomains should not start with an underscore`);
         }
     }

util/reserved.json

@@ -3,11 +3,14 @@
     "about",
     "account",
     "accounts",
+    "ad",
     "admin",
+    "ads",
     "api",
     "apis",
     "app",
     "apps",
+    "asset",
     "assets",
     "auth",
     "authentication",
@@ -15,8 +18,6 @@
     "authorise",
     "authorization",
     "authorize",
-    "ad",
-    "ads",
     "billing",
     "blog",
     "board",
@@ -37,6 +38,8 @@
     "documentation",
     "domain",
     "email",
+    "event",
+    "events",
     "example",
     "feedback",
     "file",
@@ -98,6 +101,8 @@
     "pay",
     "payment",
     "payments",
+    "poll",
+    "polls",
     "portal",
     "postmaster",
     "preview",
@@ -105,6 +110,7 @@
     "prod",
     "production",
     "r",
+    "rdap",
     "redirect",
     "register",
     "registrar",
@@ -116,6 +122,7 @@
     "service",
     "services",
     "shop",
+    "sso",
     "staff",
     "staging",
     "static",