From 74323a67856b81ef4eeb62c6dea5f621ce5ff3d6 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:02:35 +0800
Subject: [PATCH] shorten util JSON file names

---
 tests/json.test.js                            |   6 +-
 tests/special.test.js                         |   2 +-
 ...{bypassed-usernames.json => bypassed.json} |   0
 util/{excepted-domains.json => excepted.json} |   0
 util/{reserved-domains.json => reserved.json} | 240 +++++++++---------
 5 files changed, 124 insertions(+), 124 deletions(-)
 rename util/{bypassed-usernames.json => bypassed.json} (100%)
 rename util/{excepted-domains.json => excepted.json} (100%)
 rename util/{reserved-domains.json => reserved.json} (93%)

diff --git a/tests/json.test.js b/tests/json.test.js
index 16dd360a25..39d293f811 100644
--- a/tests/json.test.js
+++ b/tests/json.test.js
@@ -30,8 +30,8 @@ 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-domains.json");
-const reservedDomains = require("../util/reserved-domains.json");
+const exceptedDomains = require("../util/excepted.json");
+const reservedDomains = require("../util/reserved.json");
 const domainsPath = path.resolve("domains");
 const files = fs.readdirSync(domainsPath);
 
@@ -52,7 +52,7 @@ function expandReservedDomains(reserved) {
                 }
                 expandedList.splice(expandedList.indexOf(item), 1);
             } else {
-                throw new Error(`[util/reserved-domains.json] Invalid range [${start}-${end}] in "${item}"`);
+                throw new Error(`[util/reserved.json] Invalid range [${start}-${end}] in "${item}"`);
             }
         }
     });
diff --git a/tests/special.test.js b/tests/special.test.js
index 9861a05190..bd18e3e00c 100644
--- a/tests/special.test.js
+++ b/tests/special.test.js
@@ -5,7 +5,7 @@ const path = require("path");
 const domainsPath = path.resolve("domains");
 const files = fs.readdirSync(domainsPath).filter((file) => file.endsWith(".json"));
 
-const bypassedUsernames = require("../util/bypassed-usernames.json").map((username) => username.toLowerCase());
+const bypassedUsernames = require("../util/bypassed.json").map((username) => username.toLowerCase());
 
 function getDomainData(subdomain) {
     try {
diff --git a/util/bypassed-usernames.json b/util/bypassed.json
similarity index 100%
rename from util/bypassed-usernames.json
rename to util/bypassed.json
diff --git a/util/excepted-domains.json b/util/excepted.json
similarity index 100%
rename from util/excepted-domains.json
rename to util/excepted.json
diff --git a/util/reserved-domains.json b/util/reserved.json
similarity index 93%
rename from util/reserved-domains.json
rename to util/reserved.json
index 16b3293c76..eccc9738c3 100644
--- a/util/reserved-domains.json
+++ b/util/reserved.json
@@ -1,120 +1,120 @@
-[
-    "account",
-    "accounts",
-    "admin",
-    "administrator",
-    "alert",
-    "alerts",
-    "api",
-    "auth",
-    "authentication",
-    "authorisation",
-    "authorise",
-    "authorization",
-    "authorize",
-    "aux",
-    "billing",
-    "blog",
-    "calendar",
-    "cart",
-    "catalog",
-    "checkout",
-    "co",
-    "com",
-    "com[1-9]",
-    "con",
-    "confirm",
-    "confirmation",
-    "dashboard",
-    "default",
-    "dns",
-    "doc",
-    "documentation",
-    "email",
-    "error",
-    "errors",
-    "event",
-    "events",
-    "example",
-    "feedback",
-    "finance",
-    "forgot",
-    "forgot-password",
-    "gtld",
-    "guest",
-    "help",
-    "helpdesk",
-    "hostmaster",
-    "info",
-    "infos",
-    "login",
-    "logout",
-    "lpt[1-9]",
-    "m",
-    "mail",
-    "maintainer",
-    "maintainers",
-    "marketing",
-    "media",
-    "mobile",
-    "net",
-    "news",
-    "noc",
-    "notification",
-    "notifications",
-    "notify",
-    "ns",
-    "ns[1-99]",
-    "nul",
-    "oauth",
-    "official",
-    "operations",
-    "ops",
-    "org",
-    "organisation",
-    "pay",
-    "payment",
-    "payments",
-    "portal",
-    "postmaster",
-    "recovery",
-    "redirect",
-    "registrar",
-    "registry",
-    "reset",
-    "reset-password",
-    "root",
-    "sales",
-    "schedule",
-    "secure",
-    "security",
-    "service",
-    "services",
-    "session",
-    "sessions",
-    "shop",
-    "signin",
-    "signout",
-    "signup",
-    "staff",
-    "store",
-    "superuser",
-    "support",
-    "sys",
-    "system",
-    "teams",
-    "test",
-    "test[1-9999]",
-    "tld",
-    "token",
-    "tokens",
-    "url",
-    "url[1-9999]",
-    "user",
-    "users",
-    "webmaster",
-    "whois",
-    "www[1-99]",
-    "wwww",
-    "your-domain-name"
-]
+[
+    "account",
+    "accounts",
+    "admin",
+    "administrator",
+    "alert",
+    "alerts",
+    "api",
+    "auth",
+    "authentication",
+    "authorisation",
+    "authorise",
+    "authorization",
+    "authorize",
+    "aux",
+    "billing",
+    "blog",
+    "calendar",
+    "cart",
+    "catalog",
+    "checkout",
+    "co",
+    "com",
+    "com[1-9]",
+    "con",
+    "confirm",
+    "confirmation",
+    "dashboard",
+    "default",
+    "dns",
+    "doc",
+    "documentation",
+    "email",
+    "error",
+    "errors",
+    "event",
+    "events",
+    "example",
+    "feedback",
+    "finance",
+    "forgot",
+    "forgot-password",
+    "gtld",
+    "guest",
+    "help",
+    "helpdesk",
+    "hostmaster",
+    "info",
+    "infos",
+    "login",
+    "logout",
+    "lpt[1-9]",
+    "m",
+    "mail",
+    "maintainer",
+    "maintainers",
+    "marketing",
+    "media",
+    "mobile",
+    "net",
+    "news",
+    "noc",
+    "notification",
+    "notifications",
+    "notify",
+    "ns",
+    "ns[1-99]",
+    "nul",
+    "oauth",
+    "official",
+    "operations",
+    "ops",
+    "org",
+    "organisation",
+    "pay",
+    "payment",
+    "payments",
+    "portal",
+    "postmaster",
+    "recovery",
+    "redirect",
+    "registrar",
+    "registry",
+    "reset",
+    "reset-password",
+    "root",
+    "sales",
+    "schedule",
+    "secure",
+    "security",
+    "service",
+    "services",
+    "session",
+    "sessions",
+    "shop",
+    "signin",
+    "signout",
+    "signup",
+    "staff",
+    "store",
+    "superuser",
+    "support",
+    "sys",
+    "system",
+    "teams",
+    "test",
+    "test[1-9999]",
+    "tld",
+    "token",
+    "tokens",
+    "url",
+    "url[1-9999]",
+    "user",
+    "users",
+    "webmaster",
+    "whois",
+    "www[1-99]",
+    "wwww",
+    "your-domain-name"
+]