Update pull_request_template.md

.github/pull_request_template.md

@@ -6,23 +6,27 @@
 
      You can use the CI build or a local environment to check your changes are working as expected.
      
-     If you have questions at any time, please contact the Website Working Group at
+     If you have questions at any time, please contact the Website & Content Working Group at
      https://matrix.to/#/#matrix.org-website:matrix.org -->
 
-<!-- Please describe what you added, and add a screenshot or video if possible.
+### Description
+<!-- Please describe what you added here, and add a screenshot or video if possible.
      That makes it easier to understand the change. -->
 
-<!-- Please don't remove this checklist from your PR, as it is useful for reviewers, too. -->
-**:heavy_check_mark: Checklist**
+### :heavy_check_mark: Checklist
+<!-- Please tick as appropriate, but don't remove this checklist from your PR, as it is useful for reviewers, too. -->
 
+- [x] Keep this checklist
 - Check for common mistakes:
   - [ ] Wrap plain URLs in `<>` to linkify them ([learn more](https://github.com/matrix-org/matrix.org/blob/main/CONTENT.md#publishing-to-the-blog)).
   - [ ] Use the right level of headings: The page title will use a level 1 headings, so your headings should use level 2 and below.
   - [ ] Use internal links: when linking to another page on <https://matrix.org>, use the Zola `[label](@/target.md)` [syntax](https://www.getzola.org/documentation/content/linking/#internal-links).
 - For blog posts:
   - [ ] Verify the date and post ordering on the `/blog` page, especially for multiple posts on the same day. Prefer UTC format, e.g. `2025-12-01T14:00:00Z` for Dec 1st, 2025, 2pm UTC.
   - [ ] Set the correct author and category. Browse existing ones at <https://matrix.org/author/> and <https://matrix.org/category/> to match them.
-- [ ] Let us know if you are contributing in a specific role, such as on behalf of an organisation or team, [for example](https://github.com/matrix-org/matrix.org/pull/2788).
+- [ ] If you hold a specific role in relation to the content you are contributing, such as project maintainer or on behalf of a team or organisation, please let us know. See [example](https://github.com/matrix-org/matrix.org/pull/2969).
 - [ ] Let us know if your PR is time-sensitive in any way.
 - [ ] Mention any issues related to the PR. Use [GitHub keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) as appropriate.
 - [ ] Your individual commits or pull request is [signed off](https://github.com/matrix-org/matrix.org/blob/main/CONTRIBUTING.md).
+
+<!-- ------------------------------ DO NOT WRITE BELOW THIS LINE ------------------------------ -->

.github/workflows/pr-bot.yml

@@ -0,0 +1,30 @@
+name: PR Bot
+
+on:
+  pull_request:
+    types: [opened, reopened]  # https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=ready_for_review#pull_request
+
+jobs:
+  missing-template:
+    name: Auto-draft PRs missing template
+    runs-on: ubuntu-latest
+    permissions: write-all
+    env:
+      CHECKOUT_DIR: my-repo
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          path: ${{ env.CHECKOUT_DIR }}
+
+      - name: Check if the PR template was deleted
+        env:
+          GH_TOKEN: ${{ github.token }}
+          BASE_URL: ${{ github.server.url }}/${{ github.repository }}/blob/main
+        working-directory: ${{ env.CHECKOUT_DIR }}
+        run: |
+          if ! gh pr view $GITHUB_HEAD_REF --json 'body' | grep -q "don't remove this checklist from your PR"; then
+            gh pr ready $GITHUB_HEAD_REF --undo  # mark as draft
+            gh pr edit $GITHUB_HEAD_REF --add-label 'missing-template'
+            gh pr review $GITHUB_HEAD_REF --request-changes --body "Thanks for contributing to the matrix.org website. I have automatically marked you pull request as a draft. Please restore the [PR template]($BASE_URL/.github/pull_request_template.md?plain=1) to your PR description and follow our [contributing guidelines]($BASE_URL/CONTRIBUTING.md), then undraft to let the team know the PR is ready for review."
+          fi