Skip to content

Commit 6da7fdc

Browse files
authored
Merge branch 'keiyoushi:main' into main
2 parents 2ec6430 + 0877c47 commit 6da7fdc

File tree

829 files changed

+7371
-5321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

829 files changed

+7371
-5321
lines changed

.github/ISSUE_TEMPLATE/01_report_issue.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
description: |
1111
You can find the extension name and version in **Browse → Extensions**.
1212
placeholder: |
13-
Example: "Mangahere 1.3.18"
13+
Example: "Not Real Scans 1.4.1"
1414
validations:
1515
required: true
1616

@@ -59,11 +59,11 @@ body:
5959
- type: input
6060
id: tachiyomi-version
6161
attributes:
62-
label: Tachiyomi version
62+
label: Mihon/Tachiyomi version
6363
description: |
64-
You can find your Tachiyomi version in **More → About**.
64+
You can find your Mihon/Tachiyomi version in **More → About**.
6565
placeholder: |
66-
Example: "0.15.1"
66+
Example: "0.16.3"
6767
validations:
6868
required: true
6969

@@ -95,7 +95,7 @@ body:
9595
required: true
9696
- label: I have written a short but informative title.
9797
required: true
98-
- label: I have updated the app to version **[0.15.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
98+
- label: I have updated the app to version **[0.15.3](https://github.com/mihonapp/mihon/releases/latest)**.
9999
required: true
100100
- label: I have updated all installed extensions.
101101
required: true

.github/ISSUE_TEMPLATE/02_request_source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ body:
4545
label: Acknowledgements
4646
description: Your issue will be closed if you haven't done these steps.
4747
options:
48-
- label: I have checked that the extension does not already exist by searching the [GitHub repository](https://github.com/keiyoushi/extensions-source/) and verified it does not appear in the code base.
48+
- label: I have checked that the extension does not already exist by searching the [extension listing](https://keiyoushi.github.io/extensions/) and verified it does not appear there.
4949
required: true
5050
- label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
5151
required: true

.github/ISSUE_TEMPLATE/03_report_url_change.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
description: |
1111
You can find the extension name and version in **Browse → Extensions**.
1212
placeholder: |
13-
Example: "NotRealScans 1.3.1"
13+
Example: "NotRealScans 1.4.1"
1414
validations:
1515
required: true
1616

.github/ISSUE_TEMPLATE/04_report_dead_source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body:
1616
description: |
1717
You can find the extension name in **Browse → Extensions**.
1818
placeholder: |
19-
Example: "NotRealScans"
19+
Example: "Not Real Scans"
2020
validations:
2121
required: true
2222

.github/ISSUE_TEMPLATE/05_request_feature.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
description: |
1111
You can find the extension name in **Browse → Extensions**.
1212
placeholder: |
13-
Example: "Mangahere"
13+
Example: "Not Real Scans"
1414
validations:
1515
required: true
1616

@@ -51,10 +51,10 @@ body:
5151
required: true
5252
- label: I have written a short but informative title.
5353
required: true
54-
- label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/tachiyomiorg/tachiyomi/issues/new/choose).
54+
- label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/mihonapp/mihon/issues/new/choose).
5555
required: true
5656
- label: I have admitted that I am a clown by having checked this box, as I have not read these acknowledgements.
57-
- label: I have updated the app to version **[0.15.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
57+
- label: I have updated the app to version **[0.15.3](https://github.com/mihonapp/mihon/releases/latest)**.
5858
required: true
5959
- label: I will fill out all of the requested information in this form.
6060
required: true

.github/ISSUE_TEMPLATE/06_request_meta.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ body:
3131
required: true
3232
- label: I have written a short but informative title.
3333
required: true
34-
- label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/tachiyomiorg/tachiyomi/issues/new/choose).
34+
- label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/mihonapp/mihon/issues/new/choose).
3535
required: true
36-
- label: I have updated the app to version **[0.15.3](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
36+
- label: I have updated the app to version **[0.15.3](https://github.com/mihonapp/mihon/releases/latest)**.
3737
required: true
3838
- label: I have admitted that I am a clown by having checked this box, as I have not read these acknowledgements.
3939
- label: I have updated all installed extensions.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: ⚠️ Application issue
4-
url: https://github.com/tachiyomiorg/tachiyomi/issues/new/choose
5-
about: Issues and requests about the app itself should be opened in the tachiyomi repository instead
6-
- name: 📦 Tachiyomi official extensions
7-
url: https://tachiyomi.org/extensions
8-
about: List of all available official extensions with download links
9-
- name: 🖥️ Tachiyomi website
10-
url: https://tachiyomi.org/help/
4+
url: https://github.com/mihonapp/mihon/issues/new/choose
5+
about: Issues and requests about the app itself should be opened in Mihon's repository instead
6+
- name: 📦 Extension list
7+
url: https://keiyoushi.github.io/extensions
8+
about: List of all available extensions with download links
9+
- name: 🖥️ Mihon website
10+
url: https://mihon.app/docs/guides/troubleshooting/
1111
about: Guides, troubleshooting, and answers to common questions

.github/readme-images/app-icon.png

-1.07 KB
Binary file not shown.

.github/scripts/commit-repo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
rsync -a --delete --exclude .git --exclude .gitignore --exclude README.md ../main/repo/ .
4+
rsync -a --delete --exclude .git --exclude .gitignore --exclude README.md --exclude repo.json ../main/repo/ .
55
git config --global user.email "156378334+keiyoushi-bot@users.noreply.github.com"
66
git config --global user.name "keiyoushi-bot"
77
git status

.github/workflows/build_pull_request.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: PR build check
22

33
on:
44
pull_request:
5-
paths-ignore:
6-
- '**.md'
7-
- '.github/workflows/issue_moderator.yml'
5+
paths:
6+
- '**'
7+
- '!**.md'
8+
- '!.github/**'
9+
- '.github/workflows/build_pull_request.yml'
810

911
concurrency:
1012
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -29,7 +31,7 @@ jobs:
2931
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3032

3133
- name: Validate Gradle Wrapper
32-
uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2
34+
uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
3335

3436
- name: Set up JDK
3537
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
@@ -64,11 +66,12 @@ jobs:
6466
echo "isIndividualChanged=$isIndividualChanged" >> $GITHUB_OUTPUT
6567
echo "isMultisrcChanged=$isMultisrcChanged" >> $GITHUB_OUTPUT
6668
69+
- name: Set up Gradle
70+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
71+
6772
- name: Generate multisrc sources
6873
if: ${{ steps.parse-changed-files.outputs.isMultisrcChanged == '1' }}
69-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
70-
with:
71-
arguments: :multisrc:generateExtensions
74+
run: ./gradlew :multisrc:generateExtensions
7275

7376
- name: Get number of modules
7477
run: |
@@ -113,22 +116,21 @@ jobs:
113116
java-version: 17
114117
distribution: temurin
115118

119+
- name: Set up Gradle
120+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
121+
with:
122+
cache-read-only: true
123+
116124
- name: Generate sources from the multi-source library
117-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
118125
env:
119126
CI_MODULE_GEN: "true"
120-
with:
121-
arguments: :multisrc:generateExtensions
122-
cache-read-only: true
127+
run: ./gradlew :multisrc:generateExtensions
123128

124129
- name: Build extensions (chunk ${{ matrix.chunk }})
125-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
126130
env:
127131
CI_MULTISRC: "true"
128132
CI_CHUNK_NUM: ${{ matrix.chunk }}
129-
with:
130-
arguments: assembleDebug
131-
cache-read-only: true
133+
run: ./gradlew assembleDebug
132134

133135
build_individual:
134136
name: Build individual modules
@@ -147,11 +149,13 @@ jobs:
147149
java-version: 17
148150
distribution: temurin
149151

152+
- name: Set up Gradle
153+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
154+
with:
155+
cache-read-only: true
156+
150157
- name: Build extensions (chunk ${{ matrix.chunk }})
151-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
152158
env:
153159
CI_MULTISRC: "false"
154160
CI_CHUNK_NUM: ${{ matrix.chunk }}
155-
with:
156-
arguments: assembleDebug
157-
cache-read-only: true
161+
run: ./gradlew assembleDebug

.github/workflows/build_push.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ on:
44
push:
55
branches:
66
- main
7-
paths-ignore:
8-
- '**.md'
9-
- '.github/workflows/issue_moderator.yml'
7+
paths:
8+
- '**'
9+
- '!**.md'
10+
- '!.github/**'
11+
- '.github/scripts/**'
12+
- '.github/workflows/build_push.yml'
1013

1114
concurrency:
1215
group: ${{ github.workflow }}
@@ -29,18 +32,19 @@ jobs:
2932
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
3033

3134
- name: Validate Gradle Wrapper
32-
uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2
35+
uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2
3336

3437
- name: Set up JDK
3538
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
3639
with:
3740
java-version: 17
3841
distribution: temurin
3942

43+
- name: Set up Gradle
44+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
45+
4046
- name: Generate multisrc sources
41-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
42-
with:
43-
arguments: :multisrc:generateExtensions
47+
run: ./gradlew :multisrc:generateExtensions
4448

4549
- name: Get number of modules
4650
run: |
@@ -88,26 +92,25 @@ jobs:
8892
run: |
8993
echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
9094
95+
- name: Set up Gradle
96+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
97+
9198
- name: Generate sources from the multi-source library
92-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
9399
env:
94100
CI_MODULE_GEN: "true"
95-
with:
96-
arguments: :multisrc:generateExtensions
101+
run: ./gradlew :multisrc:generateExtensions
97102

98103
- name: Build extensions (chunk ${{ matrix.chunk }})
99-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
100104
env:
101105
CI_MULTISRC: "true"
102106
CI_CHUNK_NUM: ${{ matrix.chunk }}
103107
ALIAS: ${{ secrets.ALIAS }}
104108
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
105109
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
106-
with:
107-
arguments: assembleRelease
110+
run: ./gradlew assembleRelease
108111

109112
- name: Upload APKs (chunk ${{ matrix.chunk }})
110-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
113+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
111114
if: "github.repository == 'keiyoushi/extensions-source'"
112115
with:
113116
name: "multisrc-apks-${{ matrix.chunk }}"
@@ -137,19 +140,20 @@ jobs:
137140
run: |
138141
echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
139142
143+
- name: Set up Gradle
144+
uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3
145+
140146
- name: Build extensions (chunk ${{ matrix.chunk }})
141-
uses: gradle/actions/setup-gradle@b6816cf21e7970b88479bb3c57d9cbe5cdd4b949 # v3.0.0-rc.1
142147
env:
143148
CI_MULTISRC: "false"
144149
CI_CHUNK_NUM: ${{ matrix.chunk }}
145150
ALIAS: ${{ secrets.ALIAS }}
146151
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
147152
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
148-
with:
149-
arguments: assembleRelease
153+
run: ./gradlew assembleRelease
150154

151155
- name: Upload APKs (chunk ${{ matrix.chunk }})
152-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
156+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
153157
if: "github.repository == 'keiyoushi/extensions-source'"
154158
with:
155159
name: "individual-apks-${{ matrix.chunk }}"
@@ -168,7 +172,7 @@ jobs:
168172
runs-on: ubuntu-latest
169173
steps:
170174
- name: Download APK artifacts
171-
uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4
175+
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4
172176
with:
173177
path: ~/apk-artifacts
174178

.github/workflows/codeberg_mirror.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
jobs:
1212
codeberg:
13+
if: "github.repository == 'keiyoushi/extensions-source'"
1314
runs-on: ubuntu-latest
1415
steps:
1516
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

.github/workflows/issue_moderator.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Moderate issues
14-
uses: tachiyomiorg/issue-moderator-action@39b363606e00c4ae39a15b3705a63535cd428c15 # v2
14+
uses: keiyoushi/issue-moderator-action@a017be83547db6e107431ce7575f53c1dfa3296a
1515
with:
1616
repo-token: ${{ secrets.ISSUE_MODERATOR_PAT }}
1717
duplicate-label: Duplicate
@@ -61,12 +61,6 @@ jobs:
6161
"ignoreCase": true,
6262
"labels": ["Cloudflare protected"],
6363
"message": "Refer to the **Solving Cloudflare issues** section at https://tachiyomi.org/docs/guides/troubleshooting/#cloudflare. If it doesn't work, migrate to other sources or wait until they lower their protection."
64-
},
65-
{
66-
"type": "both",
67-
"regex": ".*(?:fail(?:ed|ure|s|ing)?|can\\s*(?:no|')?t|(?:not|un)(?:.*able)?|(?<!n[o']?t )blocked by|error) (?:to )?.*(?:install|update(?:d|ing)?)(?: extensions?)?",
68-
"ignoreCase": true,
69-
"message": "Uninstall the extension before updating. If that does not work, uninstall it from your device's settings by navigating to your device's Settings -> Apps and uninstall it from there by looking for **Tachiyomi: <extension name>**.\n\nThis is usually caused your previous extension having a different signature from the updated extension, making Android refuse to update it."
7064
}
7165
]
7266
auto-close-ignore-label: do-not-autoclose

README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
### Please give the repo a :star:
22

3-
| Build | Support Server |
4-
|-------|---------|
3+
| Build | Support Server |
4+
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
55
| [![CI](https://github.com/keiyoushi/extensions-source/actions/workflows/build_push.yml/badge.svg)](https://github.com/keiyoushi/extensions-source/actions/workflows/build_push.yml) | [![Discord](https://img.shields.io/discord/1193460528052453448.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/3FbCpdKbdY) |
66

77
# Usage
88

99
[Getting started](https://keiyoushi.github.io/docs/guides/getting-started#adding-the-extension-repo)
1010

11+
# Requests
12+
13+
To request a new source or bug fix, [create an issue](https://github.com/keiyoushi/extensions-source/issues/new/choose).
14+
15+
Please note that creating an issue does not mean that the source will be added or fixed in a timely
16+
fashion, because the work is volunteer-based. Some sources may also be impossible to do or prohibitively
17+
difficult to maintain.
18+
19+
If you would like to see a request fulfilled and have the necessary skills to do so, consider contributing!
20+
Issues are up-for-grabs for any developer if there is no assigned user already.
21+
1122
# Contributing
1223

1324
Contributions are welcome!
@@ -32,5 +43,8 @@ Check out the repo's [issue backlog](https://github.com/keiyoushi/extensions-sou
3243

3344
## Disclaimer
3445

35-
This project is not affiliated with Tachiyomi. Don't ask for help about these extensions at the official support means of Tachiyomi. All credits to the codebase goes to the original contributors.
46+
This project does not have any affiliation with the content providers available.
47+
48+
This project is not affiliated with Mihon/Tachiyomi. Don't ask for help about these extensions at the
49+
official support means of Mihon/Tachiyomi. All credits to the codebase goes to the original contributors.
3650

common.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ apply plugin: 'org.jmailen.kotlinter'
66
assert !ext.has("pkgNameSuffix")
77
assert !ext.has("libVersion")
88

9+
assert extName.chars().max().asInt < 0x180 : "Extension name should be romanized"
10+
911
android {
1012
compileSdk AndroidConfig.compileSdk
1113

0 commit comments

Comments
 (0)