From c5a09c9468d377cba33ccb92cd5ef6204c851aa7 Mon Sep 17 00:00:00 2001
From: William Harrison <87287585+wdhdev@users.noreply.github.com>
Date: Thu, 13 Mar 2025 13:01:49 +0800
Subject: [PATCH] improve pr tests

---
 tests/pr.test.js  |  8 +++++---
 util/trusted.json | 13 ++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/tests/pr.test.js b/tests/pr.test.js
index 8456e1576..eccab0791 100644
--- a/tests/pr.test.js
+++ b/tests/pr.test.js
@@ -2,7 +2,8 @@ const t = require("ava");
 const fs = require("fs-extra");
 const path = require("path");
 
-const trustedUsers = require("../util/trusted.json").map((u) => u.toLowerCase());
+const requiredEnvVars = ["CHANGED_FILES", "PR_AUTHOR", "PR_AUTHOR_ID"];
+const trustedUsers = require("../util/trusted.json").map((u) => u.id);
 
 function getDomainData(subdomain) {
     try {
@@ -14,14 +15,15 @@ function getDomainData(subdomain) {
 }
 
 t("Users can only update their own subdomains", (t) => {
-    if (process.env.PR_AUTHOR && process.env.CHANGED_FILES) {
+    if (requiredEnvVars.every((v) => process.env[v])) {
         const changedFiles = JSON.parse(process.env.CHANGED_FILES);
         const prAuthor = process.env.PR_AUTHOR.toLowerCase();
+        const prAuthorId = process.env.PR_AUTHOR_ID;
         const changedJSONFiles = changedFiles
             .filter((file) => file.startsWith("domains/"))
             .map((file) => path.basename(file));
 
-        if (!changedJSONFiles || trustedUsers.includes(prAuthor)) return t.pass();
+        if (!changedJSONFiles || trustedUsers.includes(prAuthorId)) return t.pass();
         if (process.env.PR_LABELS && process.env.PR_LABELS.includes("bypass-owner-check")) return t.pass();
 
         changedJSONFiles.forEach((file) => {
diff --git a/util/trusted.json b/util/trusted.json
index 3c6078ccf..7bba06fc2 100644
--- a/util/trusted.json
+++ b/util/trusted.json
@@ -1,11 +1,6 @@
 [
-    "21Z",
-    "DEV-DIBSTER",
-    "iostpa",
-    "is-a-dev-bot",
-    "orangci",
-    "Stef-00012",
-    "SX-9",
-    "WDH-2",
-    "wdhdev"
+    { "username": "iostpa", "id": 69630113 },
+    { "username": "wdhdev", "id": 87287585 },
+    { "username": "is-a-dev-bot", "id": 106927495 },
+    { "username": "WDH-2", "id": 115670568 }
 ]