[skip ci] chore: Merge upstream changes (#1916)

.github/workflows/batch_close_issues.yml

@@ -18,9 +18,8 @@ jobs:
         # Close everything older than ~6 months
         days-before-issue-stale: 180
         days-before-issue-close: 0
-        any-of-issue-labels: "Source request"
-        exempt-issue-labels: do-not-autoclose
-        close-issue-message: "In an effort to have a more manageable issue backlog, we're closing older requests that weren't addressed. If you think the source may still benefit others, please open a new request."
+        exempt-issue-labels: "do-not-autoclose,Meta request"
+        close-issue-message: "In an effort to have a more manageable issue backlog, we're closing older requests that weren't addressed since there's a low chance of it being addressed if it hasn't already. If your request is still relevant, please [open a new request](https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose)."
         close-issue-reason: not_planned
         ascending: true
         operations-per-run: 250

.github/workflows/build_pull_request.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths-ignore:
       - '**.md'
+      - '.github/workflows/issue_moderator.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -50,6 +51,8 @@ jobs:
               isIndividualChanged=1
             elif [[ ${changedFile} == multisrc/* ]]; then
               isMultisrcChanged=1
+            elif [[ ${changedFile} == .github/workflows/issue_moderator.yml ]]; then
+              true
             elif [[ ${changedFile} == *.md ]]; then
               true
             else
@@ -63,7 +66,7 @@ jobs:
 
       - name: Generate multisrc sources
         if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }}
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: :multisrc:generateExtensions
 
@@ -111,7 +114,7 @@ jobs:
           distribution: adopt
 
       - name: Generate sources from the multi-source library
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MODULE_GEN: "true"
         with:
@@ -119,7 +122,7 @@ jobs:
           cache-read-only: true
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "true"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
@@ -145,7 +148,7 @@ jobs:
           distribution: adopt
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}

.github/workflows/build_push.yml

@@ -6,6 +6,7 @@ on:
       - master
     paths-ignore:
       - '**.md'
+      - '.github/workflows/issue_moderator.yml'
 
 concurrency:
   group: ${{ github.workflow }}
@@ -62,7 +63,7 @@ jobs:
           distribution: adopt
 
       - name: Generate multisrc sources
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: :multisrc:generateExtensions
 
@@ -115,14 +116,14 @@ jobs:
           echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
 
       - name: Generate sources from the multi-source library
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MODULE_GEN: "true"
         with:
           arguments: :multisrc:generateExtensions
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "true"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
@@ -166,7 +167,7 @@ jobs:
           echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
 
       - name: Build extensions (chunk ${{ matrix.chunk }})
-        uses: gradle/gradle-command-action@v2
+        uses: gradle/gradle-build-action@v2
         env:
           CI_MULTISRC: "false"
           CI_CHUNK_NUM: ${{ matrix.chunk }}
@@ -190,8 +191,8 @@ jobs:
   publish_repo:
     name: Publish repo
     needs:
-      - build_individual
       - build_multisrc
+      - build_individual
     if: "github.repository == 'aniyomiorg/aniyomi-extensions'"
     runs-on: ubuntu-latest
     steps:

.github/workflows/issue_moderator.yml

@@ -14,10 +14,16 @@ jobs:
         uses: tachiyomiorg/issue-moderator-action@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          duplicate-label: Duplicate
+
           duplicate-check-enabled: true
-          duplicate-check-label: Source request
+          duplicate-check-labels: |
+            ["Source request", "Domain changed"]
+
           existing-check-enabled: true
-          existing-check-label: Source request
+          existing-check-labels: |
+            ["Source request", "Domain changed"]
+
           auto-close-rules: |
             [
               {
@@ -37,7 +43,7 @@ jobs:
               },
               {
                 "type": "both",
-                "regex": ".*(?:fail(?:ed|ure)?|can\\s*(?:no|')?t|unable|get past|(?<!n[o']?t )blocked by|error) (?:to )?(?:bypass|penetrate)?.*cloudfl?are.*",
+                "regex": ".*(?:fail(?:ed|ure|s)?|can\\s*(?:no|')?t|(?:not|un).*able|(?<!n[o']?t )blocked by|error) (?:to )?(?:get past|by ?pass|penetrate)?.*cloud ?fl?are.*",
                 "ignoreCase": true,
                 "message": "Refer to the **Solving Cloudflare issues** section at https://aniyomi.org/help/guides/troubleshooting/#solving-cloudflare-issues. If it doesn't work, migrate to other sources or wait until they lower their protection."
               }