From eb0a01e9cb7a03818b066af57aa03c1ef9757dff Mon Sep 17 00:00:00 2001
From: jvmncs <7891333+jvmncs@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:38:05 -0400
Subject: [PATCH] Relax comment restrictions in delete_comments action (#16899)

The script no longer triggers on harmless words like "Download".

Release Notes:

- N/A
---
 .github/workflows/delete_comments.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/delete_comments.yml b/.github/workflows/delete_comments.yml
index c6f12e2026..63013d3c02 100644
--- a/.github/workflows/delete_comments.yml
+++ b/.github/workflows/delete_comments.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           script: |
             const comment = context.payload.comment.body;
-            const triggerStrings = ['www.mediafire.com', 'Download', 'changeme'];
+            const triggerStrings = ['www.mediafire.com'];
             return triggerStrings.some(triggerString => comment.includes(triggerString));
 
       - name: Delete comment if it contains any of the specific strings
@@ -37,8 +37,9 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const username = context.payload.comment.user.login;
-            await github.rest.orgs.blockUser({
-              org: context.repo.owner,
-              username: username
+            const userId = context.payload.comment.user.id;
+            await github.rest.users.block({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              user_id: userId
             });