From 8a67ce8e41ec850f2d7c373aa47739b2abfee6f1 Mon Sep 17 00:00:00 2001
From: iBug <git@ibugone.com>
Date: Fri, 8 Jul 2022 23:38:44 +0800
Subject: [PATCH] Improve PR close auto-comment message (#3713)

* Improve auto-comment message

* Lock these PRs after closing
---
 .github/PULL_REQUEST_TEMPLATE.md |  3 +--
 .github/workflows/bad-pr.yml     | 13 +++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2c5d045a13f9..3271858f6dae 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,6 +26,5 @@
 -->
 
 <!--
-  Please delete this comment if you confirm that you want to submit this Pull Request.
-  CHECK_PR_DID_NOT_CONFIRM
+  Please confirm that you want to submit this Pull Request to Minimal Mistakes, the free Jekyll theme by Michael Rose, by deleting this comment block.
 -->
diff --git a/.github/workflows/bad-pr.yml b/.github/workflows/bad-pr.yml
index ce9de201d2de..e53e0e30d529 100644
--- a/.github/workflows/bad-pr.yml
+++ b/.github/workflows/bad-pr.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   close-pr:
     runs-on: ubuntu-latest
-    if: "contains(github.event.pull_request.body, 'CHECK_PR_DID_NOT_CONFIRM') || github.event.pull_request.body == ''"
+    if: "contains(github.event.pull_request.body, 'by deleting this comment block') || github.event.pull_request.body == ''"
     steps:
       - uses: actions-ecosystem/action-add-labels@v1
         with:
@@ -15,4 +15,13 @@ jobs:
       - uses: superbrothers/close-pull-request@v3
         with:
           # Optional. Post an issue comment just before closing a pull request.
-          comment: "This PR is not valid for inclusion. Please check again if you're submitting improvements for *the theme*."
+          comment: |
+            **You have created a Pull Request to the wrong repository.** This is the repository for [Minimal Mistakes][1], the free Jekyll theme. See [GitHub Docs: About pull requests][2] if you need help.
+
+              [1]: https://mmistakes.github.io/minimal-mistakes/
+              [2]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
+      - uses: sudo-bot/action-pull-request-lock@v1.0.5
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          number: ${{ github.event.pull_request.number }}
+          lock-reason: spam