From 7a4b712dffc571663ca289ef7408431c1cc93bb7 Mon Sep 17 00:00:00 2001
From: bbhtt <bbhtt.zn0i8@slmail.me>
Date: Mon, 24 Mar 2025 23:14:17 +0530
Subject: [PATCH] merge: Use github token to check if actor is reviewer and add
 label

---
 .github/workflows/merge.yml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 4ad013d..5357f42 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   merge:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/merge') }}
     container:
       image: ghcr.io/flathub/actions/merge:latest@sha256:ebeb5c952d8277b56ac96c72c66205c32d241119d086e9e7fa8848e80df39107
@@ -16,16 +18,25 @@ jobs:
       - name: Check if actor is reviewer
         id: check_reviewer
         run: |
-          if gh api /orgs/"$REPO_OWNER"/teams/reviewers/memberships/"$ACTOR" --silent; then
+          if [ "$(gh api --silent repos/"$GH_REPO"/collaborators/"$ACTOR"/permission | jq -r '.user.permissions.push')" == "true" ]; then
             echo "is-reviewer=true" >> "$GITHUB_OUTPUT"
           else
             echo "is-reviewer=false" >> "$GITHUB_OUTPUT"
           fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.FLATHUBBOT_TOKEN }}
-          REPO_OWNER: ${{ github.repository_owner }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
           ACTOR: ${{ github.actor }}
 
+      - name: Add ready label
+        run: |
+          if ! gh pr view --json labels -q '.labels[].name' "$PR_NUMBER"|grep -qE "^ready$"; then
+            gh pr edit "$PR_NUMBER" --add-label "ready"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.number }}
+
       - run: /app/entrypoint.py
         if: ${{ steps.check_reviewer.outputs.is-reviewer == 'true' }}
         env: