diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 90704dd7fb..053d37050e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,7 +4,7 @@ I acknowledge that: - I have updated to the latest version of the app (stable is v0.12.3.10) - I have updated all extensions -- If this is an issue with the app itself, that I should be opening an issue in https://github.com/jmir1/aniyomi +- If this is an issue with the app itself, that I should be opening an issue in https://github.com/aniyomiorg/aniyomi - I have searched the existing issues for duplicates - For source requests, I have checked the list of existing extensions including the multi-source spreadsheet: https://aniyomi.org/extensions/ diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ab9370f08e..9e1a6b4eff 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: ⚠️ Application issue - url: https://github.com/jmir1/aniyomi/issues/new/choose + url: https://github.com/aniyomiorg/aniyomi/issues/new/choose about: Issues and requests about the app itself should be opened in the tachiyomi repository instead - name: 📦 Aniyomi extensions url: https://aniyomi.org/extensions @@ -10,5 +10,5 @@ contact_links: url: https://aniyomi.org/help/ about: Guides, troubleshooting, and answers to common questions - name: Aniyomi app GitHub repository - url: https://github.com/jmir1/aniyomi + url: https://github.com/aniyomiorg/aniyomi about: Issues about the app itself should be opened here instead. diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml index 6053693251..cbb1872f00 100644 --- a/.github/ISSUE_TEMPLATE/report_issue.yml +++ b/.github/ISSUE_TEMPLATE/report_issue.yml @@ -85,13 +85,13 @@ 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/jmir1/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 - label: I have tried the [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/). required: true - - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/jmir1/aniyomi/issues/new/choose). + - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/aniyomiorg/aniyomi/issues/new/choose). required: true - label: I will fill out all of the requested information in this form. required: true diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml index d22732d339..dc57359225 100644 --- a/.github/ISSUE_TEMPLATE/request_feature.yml +++ b/.github/ISSUE_TEMPLATE/request_feature.yml @@ -41,9 +41,9 @@ body: required: true - label: I have written a short but informative title. required: true - - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/jmir1/aniyomi/issues/new/choose). + - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/aniyomiorg/aniyomi/issues/new/choose). required: true - - label: I have updated the app to version **[0.13.5](https://github.com/jmir1/aniyomi/releases/latest)**. + - label: I have updated the app to version **[0.13.5](https://github.com/aniyomiorg/aniyomi/releases/latest)**. required: true - label: I will fill out all of the requested information in this form. required: true diff --git a/.github/ISSUE_TEMPLATE/request_meta.yml b/.github/ISSUE_TEMPLATE/request_meta.yml index f02aca47e0..3dcf724161 100644 --- a/.github/ISSUE_TEMPLATE/request_meta.yml +++ b/.github/ISSUE_TEMPLATE/request_meta.yml @@ -31,9 +31,9 @@ body: required: true - label: I have written a short but informative title. required: true - - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/jmir1/aniyomi/issues/new/choose). + - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/aniyomiorg/aniyomi/issues/new/choose). required: true - - label: I have updated the app to version **[0.13.5](https://github.com/jmir1/aniyomi/releases/latest)**. + - label: I have updated the app to version **[0.13.5](https://github.com/aniyomiorg/aniyomi/releases/latest)**. required: true - label: I have updated all installed extensions. required: true diff --git a/.github/ISSUE_TEMPLATE/request_source.yml b/.github/ISSUE_TEMPLATE/request_source.yml index b0b3f771b2..2277cb5920 100644 --- a/.github/ISSUE_TEMPLATE/request_source.yml +++ b/.github/ISSUE_TEMPLATE/request_source.yml @@ -49,7 +49,7 @@ body: required: true - label: I have checked that the extension does not already exist on the [website extensions list](https://aniyomi.org/extensions/) or the app. required: true - - label: I have checked that the extension does not already exist by searching the [GitHub repository](https://github.com/jmir1/aniyomi-extensions/) and verified it does not appear in the code base. + - label: I have checked that the extension does not already exist by searching the [GitHub repository](https://github.com/aniyomiorg/aniyomi-extensions/) and verified it does not appear in the code base. required: true - label: I will fill out all of the requested information in this form. required: true diff --git a/.github/scripts/commit-repo.sh b/.github/scripts/commit-repo.sh index 2cddbe25f9..63733af579 100755 --- a/.github/scripts/commit-repo.sh +++ b/.github/scripts/commit-repo.sh @@ -11,7 +11,7 @@ if [ -n "$(git status --porcelain)" ]; then git push # Purge cached index on jsDelivr - curl https://purge.jsdelivr.net/gh/jmir1/aniyomi-extensions@repo/index.min.json + curl https://purge.jsdelivr.net/gh/aniyomiorg/aniyomi-extensions@repo/index.min.json else echo "No changes to commit" fi diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index b8975ac7aa..ddbf6c9400 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -124,7 +124,7 @@ jobs: - name: Upload APKs (chunk ${{ matrix.chunk }}) uses: actions/upload-artifact@v3 - if: "github.repository == 'jmir1/aniyomi-extensions'" + if: "github.repository == 'aniyomiorg/aniyomi-extensions'" with: name: "multisrc-apks-${{ matrix.chunk }}" path: "**/*.apk" @@ -168,7 +168,7 @@ jobs: - name: Upload APKs (chunk ${{ matrix.chunk }}) uses: actions/upload-artifact@v3 - if: "github.repository == 'jmir1/aniyomi-extensions'" + if: "github.repository == 'aniyomiorg/aniyomi-extensions'" with: name: "individual-apks-${{ matrix.chunk }}" path: "**/*.apk" @@ -182,7 +182,7 @@ jobs: needs: - build_individual - build_multisrc - if: "github.repository == 'jmir1/aniyomi-extensions'" + if: "github.repository == 'aniyomiorg/aniyomi-extensions'" runs-on: ubuntu-latest steps: - name: Download APK artifacts @@ -206,7 +206,7 @@ jobs: run: | cd master ./.github/scripts/move-apks.sh - INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/jmir1/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')" + INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')" curl -L "$INSPECTOR_LINK" -o ./Inspector.jar java -jar ./Inspector.jar "apk" "output.json" "tmp" ./.github/scripts/create-repo.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb2b889a5c..ed5f94aaac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ This guide have some instructions and tips on how to create a new Aniyomi extension. Please **read it carefully** if you're a new contributor or don't have any experience on the required languages and knowledges. -This guide is not definitive and it's being updated over time. If you find any issue on it, feel free to report it through a [Meta Issue](https://github.com/jmir1/aniyomi-extensions/issues/new?assignees=&labels=Meta+request&template=request_meta.yml) or fixing it directly by submitting a Pull Request. +This guide is not definitive and it's being updated over time. If you find any issue on it, feel free to report it through a [Meta Issue](https://github.com/aniyomiorg/aniyomi-extensions/issues/new?assignees=&labels=Meta+request&template=request_meta.yml) or fixing it directly by submitting a Pull Request. ## Table of Contents @@ -190,7 +190,7 @@ apply from: "$rootDir/common.gradle" | `pkgNameSuffix` | A unique suffix added to `eu.kanade.tachiyomi.animeextension`. The language and the site name should be enough. Remember your extension code implementation must be placed in this package. | | `extClass` | Points to the class that implements `AnimeSource`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). | | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. | -| `libVersion` | (Optional, defaults to `13`) The version of the [extensions library](https://github.com/jmir1/extensions-lib) used. | +| `libVersion` | (Optional, defaults to `13`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. | | `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. | The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `12.1`. @@ -199,11 +199,11 @@ The extension's version name is generated automatically by concatenating `libVer #### Extension API -Extensions rely on [extensions-lib](https://github.com/jmir1/extensions-lib), which provides some interfaces and stubs from the [app](https://github.com/jmir1/aniyomi) for compilation purposes. The actual implementations can be found [here](https://github.com/jmir1/aniyomi/tree/master/app/src/main/java/eu/kanade/tachiyomi/animesource). Referencing the actual implementation will help with understanding extensions' call flow. +Extensions rely on [extensions-lib](https://github.com/aniyomiorg/extensions-lib), which provides some interfaces and stubs from the [app](https://github.com/aniyomiorg/aniyomi) for compilation purposes. The actual implementations can be found [here](https://github.com/aniyomiorg/aniyomi/tree/master/app/src/main/java/eu/kanade/tachiyomi/animesource). Referencing the actual implementation will help with understanding extensions' call flow. #### Rate limiting library -[`lib-ratelimit`](https://github.com/jmir1/aniyomi-extensions/tree/master/lib/ratelimit) is a library for adding rate limiting functionality as an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/). +[`lib-ratelimit`](https://github.com/aniyomiorg/aniyomi-extensions/tree/master/lib/ratelimit) is a library for adding rate limiting functionality as an [OkHttp interceptor](https://square.github.io/okhttp/interceptors/). ```gradle dependencies { @@ -213,7 +213,7 @@ dependencies { #### Additional dependencies -You may find yourself needing additional functionality and wanting to add more dependencies to your `build.gradle` file. Since extensions are run within the main Aniyomi app, you can make use of [its dependencies](https://github.com/jmir1/aniyomi/blob/master/app/build.gradle.kts). +You may find yourself needing additional functionality and wanting to add more dependencies to your `build.gradle` file. Since extensions are run within the main Aniyomi app, you can make use of [its dependencies](https://github.com/aniyomiorg/aniyomi/blob/master/app/build.gradle.kts). For example, an extension that needs coroutines, it could add the following: @@ -228,7 +228,7 @@ dependencies { Notice that we're using `compileOnly` instead of `implementation`, since the app already contains it. You could use `implementation` instead for a new dependency, or you prefer not to rely on whatever the main app has at the expense of app size. -Note that using `compileOnly` restricts you to versions that must be compatible with those used in [Aniyomi v0.10.12+](https://github.com/jmir1/aniyomi/blob/v0.10.12/app/build.gradle.kts) for proper backwards compatibility. +Note that using `compileOnly` restricts you to versions that must be compatible with those used in [Aniyomi v0.10.12+](https://github.com/aniyomiorg/aniyomi/blob/v0.10.12/app/build.gradle.kts) for proper backwards compatibility. ### Extension main class @@ -275,7 +275,7 @@ a.k.a. the Latest source entry point in the app (invoked by tapping on the "Late ##### Filters -The search flow have support to filters that can be added to a `FilterList` inside the `getFilterList` method. When the user changes the filters' state, they will be passed to the `searchRequest`, and they can be iterated to create the request (by getting the `filter.state` value, where the type varies depending on the `Filter` used). You can check the filter types available [here](https://github.com/jmir1/aniyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt) and in the table below. +The search flow have support to filters that can be added to a `FilterList` inside the `getFilterList` method. When the user changes the filters' state, they will be passed to the `searchRequest`, and they can be iterated to create the request (by getting the `filter.state` value, where the type varies depending on the `Filter` used). You can check the filter types available [here](https://github.com/aniyomiorg/aniyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt) and in the table below. | Filter | State type | Description | | ------ | ---------- | ----------- | @@ -306,7 +306,7 @@ open class UriPartFilter(displayName: String, private val vals: Array 0.13.4. + - The default date has [changed](https://github.com/aniyomiorg/aniyomi/pull/7197) in Aniyomi preview ≥ r4442 or stable > 0.13.4. - In older versions, the default date is always the fetch date. - In newer versions, this is the same if every (new) episode has `0L` returned. - However, if the source only provides the upload date of the latest episode, you can now set it to the latest episode and leave other episodes default. The app will automatically set it (instead of fetch date) to every new episode and leave old episodes' dates untouched. @@ -356,7 +356,7 @@ open class UriPartFilter(displayName: String, private val vals: Array" -a android.intent.action.VIEW There is some cases where existing sources changes their name on the website. To correctly reflect these changes in the extension, you need to explicity set the `id` to the same old value, otherwise it will get changed by the new `name` value and users will be forced to migrate back to the source. -To get the current `id` value before the name change, you can search the source name in the [repository JSON file](https://github.com/jmir1/aniyomi-extensions/blob/repo/index.json) by looking into the `sources` attribute of the extension. When you have the `id` copied, you can override it in the source: +To get the current `id` value before the name change, you can search the source name in the [repository JSON file](https://github.com/aniyomiorg/aniyomi-extensions/blob/repo/index.json) by looking into the `sources` attribute of the extension. When you have the `id` copied, you can override it in the source: ```kotlin override val id: Long = diff --git a/README.md b/README.md index 9855bc97fe..13a180ec79 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ | Build | Support Server | |-------|---------| -| ![CI](https://github.com/jmir1/aniyomi-extensions/workflows/CI/badge.svg?event=push) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) | +| ![CI](https://github.com/aniyomiorg/aniyomi-extensions/workflows/CI/badge.svg?event=push) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) | # ![app icon](./.github/readme-images/app-icon.png)Aniyomi Extensions Aniyomi is a free and open source manga reader for Android 6.0 and above. -This repository contains the available extension catalogues for the [Aniyomi](https://github.com/jmir1/aniyomi) fork. +This repository contains the available extension catalogues for the [Aniyomi](https://github.com/aniyomiorg/aniyomi) fork. # Usage @@ -13,7 +13,7 @@ Extension sources can be downloaded, installed, and uninstalled via the main Ani ## Downloads -If you prefer to directly download the APK files, they are available via https://aniyomi.org/extensions/ or directly in this GitHub repository in the [`repo` branch](https://github.com/jmir1/aniyomi-extensions/tree/repo/apk). +If you prefer to directly download the APK files, they are available via https://aniyomi.org/extensions/ or directly in this GitHub repository in the [`repo` branch](https://github.com/aniyomiorg/aniyomi-extensions/tree/repo/apk). # Requests @@ -23,7 +23,7 @@ Source requests here are meant as up-for-grabs for any developer, thus it's impo Contributions are welcome! -Check out the repo's [issue backlog](https://github.com/jmir1/aniyomi-extensions/issues) for source requests and bug reports. +Check out the repo's [issue backlog](https://github.com/aniyomiorg/aniyomi-extensions/issues) for source requests and bug reports. To get started with development, see [CONTRIBUTING.md](./CONTRIBUTING.md). diff --git a/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt index 9d397f5b87..b2b752af18 100644 --- a/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt +++ b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt @@ -282,7 +282,7 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // ============================= Utilities ============================== - // https://github.com/jmir1/aniyomi-extensions/blob/master/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt + // https://github.com/aniyomiorg/aniyomi-extensions/blob/master/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt private fun extractVideo(epUrl: EpUrl): Pair, String> { val videoList = mutableListOf