Merge branch 'main' into child

Signed-off-by: Mukund Jha <[email protected]>

Author: mukundkumarjha

.github/scripts/bot-advanced-check.sh

@@ -89,26 +89,20 @@ get_intermediate_count() {
 already_commented() {
   local user=$1
   local marker="$COMMENT_MARKER_PREFIX @$user"
-
   gh issue view "$ISSUE_NUMBER" --repo "$REPO" \
     --json comments \
-    --jq --arg marker "$marker" '
-      .comments[].body
-      | select(contains($marker))
-    ' | grep -q .
+    --jq '.comments[].body' | grep -Fq "$marker"
 }
 
 #######################################
 # Helper: is user currently assigned?
 #######################################
+
 is_assigned() {
   local user=$1
-
   gh issue view "$ISSUE_NUMBER" --repo "$REPO" \
     --json assignees \
-    --jq --arg user "$user" '
-      .assignees[].login | select(. == $user)
-    ' | grep -q .
+    --jq '.assignees[].login' | grep -Fxq "$user"
 }
 
 #######################################
@@ -215,8 +209,20 @@ $COMMENT_MARKER_PREFIX @$user"
   fi
 
   if is_assigned "$user"; then
-    log "Unassigning @$user."
-    gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --remove-assignee "$user"
+  log "Unassigning @$user ..."
+  json_body="{\"assignees\": [\"$user\"]}"
+  response=$(
+    gh api \
+      --method DELETE \
+      "repos/$REPO/issues/$ISSUE_NUMBER/assignees" \
+      --input <(echo "$json_body") \
+      || echo "error"
+    )
+    if [[ "$response" != "error" ]]; then
+      log "Successfully unassigned @$user."
+    else
+      log "Failed to unassign @$user."
+    fi
   else
     log "User @$user already unassigned. Skipping."
   fi
@@ -248,4 +254,4 @@ else
   while read -r user; do
     [[ -n "$user" ]] && check_user "$user"
   done <<< "$ASSIGNEES"
-fi
+fi

.github/scripts/bot-gfi-assign-on-comment.js

@@ -146,28 +146,41 @@ async function isRepoCollaborator({ github, owner, repo, username }) {
     }
 
     try {
-        await github.rest.repos.checkCollaborator({
+        const response = await github.rest.repos.getCollaboratorPermissionLevel({
             owner,
             repo,
             username,
         });
-        return true; // 204 = collaborator
+
+        const permission = response?.data?.permission;
+
+        const isTeamMember =
+            permission === 'admin' ||
+            permission === 'write' ||
+            permission === 'maintain' ||
+            permission === 'read';
+
+        console.log('[gfi-assign] isRepoCollaborator:', {
+            username,
+            permission,
+            isTeamMember,
+        });
+
+        return isTeamMember;
     } catch (error) {
-        if (error?.status === 404 || isPermissionFailure(error)) {
-            if (isPermissionFailure(error)) {
-                console.log(
-                    '[gfi-assign] isRepoCollaborator: insufficient permissions; treating as non-collaborator',
-                    { owner, repo, username, status: error.status }
-                );
-            }
+        if (isPermissionFailure(error) || error?.status === 404) {
+            console.log(
+                '[gfi-assign] isRepoCollaborator: no permission / not collaborator',
+                { username, status: error.status }
+            );
             return false;
         }
-        throw error; // unexpected error
+        throw error;
     }
-
 }
 
 
+
 /// START OF SCRIPT ///
 module.exports = async ({ github, context }) => {
     try {
@@ -220,7 +233,7 @@ module.exports = async ({ github, context }) => {
                     username,
                 });
 
-                if (isTeamMember) {
+                if (isTeamMember) {          
                     console.log('[gfi-assign] Skip reminder: commenter is collaborator');
                     return;
                 }
@@ -397,4 +410,4 @@ module.exports = async ({ github, context }) => {
         });
         throw error;
     }
-};
+};