From cbb8ad449915faee90a7e1613d5ba5f591f18161 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 12 Jan 2026 12:21:17 +0100
Subject: [PATCH] chore: rework the new contributor workflow (#6683)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .github/workflows/new_contributor_pr.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/new_contributor_pr.yml b/.github/workflows/new_contributor_pr.yml
index 100ff18b3..38c0a8f46 100644
--- a/.github/workflows/new_contributor_pr.yml
+++ b/.github/workflows/new_contributor_pr.yml
@@ -4,9 +4,9 @@ on:
   # Safety
   # This workflow uses pull_request_target so it can run with write permissions on first-time contributor PRs.
   # It is safe because it does not check out or execute any code from the pull request and
-  # only uses the pinned, trusted actions/first-interaction action
+  # only uses the pinned, trusted plbstl/first-contribution action
   pull_request_target: # zizmor: ignore[dangerous-triggers]
-    types: [opened]
+    types: [opened, closed]
     branches:
       - master
 
@@ -20,20 +20,21 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/first-interaction@1c4688942c71f71d4f5502a26ea67c331730fa4d # v3.1.0
+      - uses: plbstl/first-contribution@4b2b042fffa26792504a18e49aa9543a87bec077 # v4.1.0
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          issue_message: "This is a required parameter, but we don't run on this event as we consider it a bit spammy.."
-          pr_message: |
-            Hello! Thank you for your contribution 👋
+          pr-reactions: rocket
+          pr-opened-msg: >
+            Hello and thanks for lending a paw to Uptime Kuma! 🐻👋
 
-            As this is your first contribution, please be sure to check out our
-            [Pull Request guidelines](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma).
+            As this is your first contribution, please be sure to check out our [Pull Request guidelines](https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma).
 
             In particular:
             - Mark your PR as Draft while you’re still making changes
-            - Mark it as Ready for review once it’s fully ready 🟢
+            - Mark it as Ready for review once it’s fully ready
 
             If you have any design or process questions, feel free to ask them right here in this pull request - unclear documentation is a bug too.
+          pr-merged-msg: >
+            @{fc-author} congrats on your first contribution to Uptime Kuma! 🐻
 
-            Thanks for lending a paw to Uptime Kuma 🐻
+            We hope you enjoy contributing to our project and look forward to seeing more of your work in the future!
+            If you want to see your contribution in action, please see our [nightly builds here](https://hub.docker.com/layers/louislam/uptime-kuma/nightly2).