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

2023-07-17 07:43:52 +00:00
parent 5bc10f3b8b
commit e6fcd0c753
16 changed files with 301 additions and 146 deletions
--- a/.github/ISSUE_TEMPLATE/01_report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/01_report_issue.yml
@ -2,10 +2,11 @@ name: 🐞 Issue report
 description: Report a source issue in Aniyomi
 labels: [Bug]
 body:
+
  - type: input
    id: source
    attributes:
-      label: Source information and language
+      label: Source information
      description: |
        You can find the extension name and version in **Browse → Extensions**.
      placeholder: |
@ -13,6 +14,15 @@ body:
    validations:
      required: true

+  - type: input
+    id: language
+    attributes:
+      label: Source language
+      placeholder: |
+        Example: "English"
+    validations:
+      required: true
+
  - type: textarea
    id: reproduce-steps
    attributes:
@ -53,7 +63,7 @@ body:
      description: |
        You can find your Aniyomi version in **More → About**.
      placeholder: |
-        Example: "0.12.3.10" or "Beta r6080"
+        Example: "0.12.3.10" or "Preview r6151"
    validations:
      required: true

@ -85,7 +95,7 @@ body:
          required: true
        - label: I have written a short but informative title.
          required: true
-        - label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**
+        - label: I have updated the app to version **[0.12.3.10](https://github.com/aniyomiorg/aniyomi/releases/latest)**.
          required: true
        - label: I have updated all installed extensions.
          required: true
--- a/.github/ISSUE_TEMPLATE/02_request_source.yml
+++ b/.github/ISSUE_TEMPLATE/02_request_source.yml
@ -2,6 +2,7 @@ name: 🌐 Source request
 description: Suggest a new source for Aniyomi
 labels: [Source request]
 body:
+
  - type: input
    id: name
    attributes:
@ -23,7 +24,7 @@ body:
  - type: input
    id: language
    attributes:
-      label: Language
+      label: Source language
      placeholder: |
        Example: "English"
    validations:
--- a/.github/ISSUE_TEMPLATE/03_report_url_change.yml
+++ b/.github/ISSUE_TEMPLATE/03_report_url_change.yml
@ -1,15 +1,25 @@
 name: 🔗 URL change report
-description: Report a URL change for an existing source
+description: Report URL change of an existing source
 labels: [Bug,Domain changed]
 body:
+
  - type: input
    id: source
    attributes:
-      label: Source information and language
+      label: Source information
      description: |
        You can find the extension name and version in **Browse → Extensions**.
      placeholder: |
-        Example: "NotRealSource 13.1 (English)"
+        Example: "NotRealSource 13.1"
+    validations:
+      required: true
+
+  - type: input
+    id: language
+    attributes:
+      label: Source language
+      placeholder: |
+        Example: "English"
    validations:
      required: true

@ -41,7 +51,7 @@ body:
          required: true
        - label: I have updated all installed extensions.
          required: true
-        - label: I have checked if the source URL is not already updated by opening WebView.
+        - label: I have opened WebView and checked that the source URL is not updated yet.
          required: true
        - label: I will fill out all of the requested information in this form.
          required: true
--- a/.github/ISSUE_TEMPLATE/04_report_dead_source.yml
+++ b/.github/ISSUE_TEMPLATE/04_report_dead_source.yml
@ -0,0 +1,63 @@
+name: ❌ Dead source report
+description: Source is down and website is closed
+labels: [Source is down]
+body:
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Notice
+        If you have a lot of dead sources to report, please go back and submit a single meta request.
+
+  - type: input
+    id: source
+    attributes:
+      label: Source name
+      description: |
+        You can find the extension name in **Browse → Extensions**.
+      placeholder: |
+        Example: "NotRealSource"
+    validations:
+      required: true
+
+  - type: input
+    id: language
+    attributes:
+      label: Source language
+      placeholder: |
+        Example: "English"
+    validations:
+      required: true
+
+  - type: input
+    id: link
+    attributes:
+      label: Source link
+      placeholder: |
+        Example: "https://notrealsource.org"
+    validations:
+      required: true
+
+  - type: textarea
+    id: other-details
+    attributes:
+      label: Other details
+      placeholder: |
+        Additional details and attachments.
+
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
+          required: true
+        - label: I have written a title with source name.
+          required: true
+        - label: I have updated all installed extensions.
+          required: true
+        - label: I have opened WebView and checked that the source website is down.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
--- a/.github/ISSUE_TEMPLATE/05_request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/05_request_feature.yml
@ -2,14 +2,24 @@ name: ⭐ Feature request
 description: Suggest a feature to improve an existing source
 labels: [Feature request]
 body:
+
  - type: input
    id: source
    attributes:
-      label: Source name and language
+      label: Source name
      description: |
        You can find the extension name in **Browse → Extensions**.
      placeholder: |
-        Example: "DopeBox (English)"
+        Example: "DopeBox"
+    validations:
+      required: true
+
+  - type: input
+    id: language
+    attributes:
+      label: Source language
+      placeholder: |
+        Example: "English"
    validations:
      required: true

--- a/.github/ISSUE_TEMPLATE/06_request_meta.yml
+++ b/.github/ISSUE_TEMPLATE/06_request_meta.yml
@ -1,4 +1,4 @@
-name: 🧠 Meta feature request
+name: 🧠 Meta request
 description: Suggest improvements to the project
 labels: [Meta request]
 body:
@ -27,7 +27,7 @@ body:
      label: Acknowledgements
      description: Your issue will be closed if you haven't done these steps.
      options:
-        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open (or closed) issue.
          required: true
        - label: I have written a short but informative title.
          required: true
--- a/.github/ISSUE_TEMPLATE/07_request_removal.yml
+++ b/.github/ISSUE_TEMPLATE/07_request_removal.yml
--- a/.github/workflows/batch_close_issues.yml
+++ b/.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
--- a/.github/workflows/build_pull_request.yml
+++ b/.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 }}
--- a/.github/workflows/build_push.yml
+++ b/.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:
--- a/.github/workflows/issue_moderator.yml
+++ b/.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."
              }