From 7b4eb9f1df9bde675c75c6903238e2fb889bac90 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 3 Nov 2023 05:55:59 +0100
Subject: [PATCH 1/5] Add new action.

---
 .github/workflows/lock-after-close.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/lock-after-close.yml

diff --git a/.github/workflows/lock-after-close.yml b/.github/workflows/lock-after-close.yml
new file mode 100644
index 0000000000..43294fb579
--- /dev/null
+++ b/.github/workflows/lock-after-close.yml
@@ -0,0 +1,13 @@
+name: "Issues - Lock closed issues"
+
+on: 
+  issues:
+    types: [closed]
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: OSDKDev/lock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file

From 9879378566c022987091ecb8fabfcf364eb4a28a Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 3 Nov 2023 05:57:25 +0100
Subject: [PATCH 2/5] Add action to prune list.

---
 .github/workflows/cleanup.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 6373796287..5b5932023f 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -59,6 +59,7 @@ jobs:
               'closed-issues.yml',
               'depsreview.yml',
               'label-actions.yml',
+              'lock-after-close.yml',
               'lock.yml',
               'sonarcloud.yml',
               'stale.yml'

From d653bb24cb9fae43df2b58f5023ed0a0e5cd1a05 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 3 Nov 2023 05:59:17 +0100
Subject: [PATCH 3/5] Merge into single action.

---
 .github/workflows/cleanup.yml          |  1 -
 .github/workflows/closed-issues.yml    |  3 +++
 .github/workflows/lock-after-close.yml | 13 -------------
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 .github/workflows/lock-after-close.yml

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index 5b5932023f..6373796287 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -59,7 +59,6 @@ jobs:
               'closed-issues.yml',
               'depsreview.yml',
               'label-actions.yml',
-              'lock-after-close.yml',
               'lock.yml',
               'sonarcloud.yml',
               'stale.yml'
diff --git a/.github/workflows/closed-issues.yml b/.github/workflows/closed-issues.yml
index 5dcbb2958b..e5a86090b5 100644
--- a/.github/workflows/closed-issues.yml
+++ b/.github/workflows/closed-issues.yml
@@ -22,3 +22,6 @@ jobs:
 
             Thank you for your contributions.
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    - uses: OSDKDev/lock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/.github/workflows/lock-after-close.yml b/.github/workflows/lock-after-close.yml
deleted file mode 100644
index 43294fb579..0000000000
--- a/.github/workflows/lock-after-close.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: "Issues - Lock closed issues"
-
-on: 
-  issues:
-    types: [closed]
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: OSDKDev/lock-issues@v1.1
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file

From 280c94189900df833f9d83d145e07a761a7227b6 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 3 Nov 2023 06:01:49 +0100
Subject: [PATCH 4/5] Fix action

---
 .github/workflows/closed-issues.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/closed-issues.yml b/.github/workflows/closed-issues.yml
index e5a86090b5..5d4a6210cd 100644
--- a/.github/workflows/closed-issues.yml
+++ b/.github/workflows/closed-issues.yml
@@ -1,4 +1,5 @@
-name: "Issues - Reply to closed issue"
+---
+name: Issues - Reply to closed issue
 on:
   issues:
     types:
@@ -21,7 +22,7 @@ jobs:
             If there is more to discuss, please open [a new issue](https://github.com/firefly-iii/firefly-iii/issues/new/choose) or [discussion](https://github.com/firefly-iii/firefly-iii/discussions/).
 
             Thank you for your contributions.
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-    - uses: OSDKDev/lock-issues@v1.1
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: OSDKDev/lock-issues@v1.1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

From c3a779df12b5bdd73567dfe3e1bde7ed4f5e65c9 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Fri, 3 Nov 2023 06:02:48 +0100
Subject: [PATCH 5/5] Rename action

---
 .github/workflows/closed-issues.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/closed-issues.yml b/.github/workflows/closed-issues.yml
index 5d4a6210cd..34c0e86590 100644
--- a/.github/workflows/closed-issues.yml
+++ b/.github/workflows/closed-issues.yml
@@ -5,7 +5,7 @@ on:
     types:
       - closed
 jobs:
-  auto_comment:
+  command_and_close:
     runs-on: ubuntu-latest
     steps:
       - uses: aws-actions/closed-issue-message@v1