Skip to content

Commit

Permalink
chore: change repo links to aniyomiorg (#1035)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmir1 authored Jun 16, 2023
1 parent 43e8dcd commit 0878797
Show file tree
Hide file tree
Showing 20 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ I acknowledge that:
- To the latest version of the app (stable is v0.12.3.10)
- All extensions
- I have tried the troubleshooting guide: https://aniyomi.org/help/guides/troubleshooting-problems/
- If this is an issue with an anime extension, that I should be opening an issue in https://github.com/jmir1/aniyomi-extensions
- If this is an issue with an anime extension, that I should be opening an issue in https://github.com/aniyomiorg/aniyomi-extensions
- I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open or closed issue
- I will fill out the title and the information in this template

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: ⚠️ Anime extension/source issue
url: https://github.com/jmir1/aniyomi-extensions/issues/new/choose
url: https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose
about: Issues and requests for extensions and sources should be opened in the aniyomi-extensions repository instead
- name: 📦 Aniyomi extensions
url: https://aniyomi.org/extensions
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/report_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ body:
required: true
- label: I have written a short but informative title.
required: true
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/jmir1/aniyomi-extensions/issues/new/choose).
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose).
required: true
- label: I have tried the [troubleshooting guide](https://aniyomi.org/help/guides/troubleshooting/).
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
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/request_feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ body:
required: true
- label: I have written a short but informative title.
required: true
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/jmir1/aniyomi-extensions/issues/new/choose).
- label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/aniyomiorg/aniyomi-extensions/issues/new/choose).
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 will fill out all of the requested information in this form.
required: true
8 changes: 4 additions & 4 deletions .github/workflows/build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ jobs:

- name: Get tag name

if: startsWith(github.ref, 'refs/tags/') && github.repository == 'jmir1/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
run: |
set -x
echo "VERSION_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
- name: Sign APK
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'jmir1/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: app/build/outputs/apk/standard/release
Expand All @@ -54,7 +54,7 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}

- name: Clean up build artifacts
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'jmir1/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
run: |
set -e
Expand All @@ -79,7 +79,7 @@ jobs:
echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV
- name: Create Release
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'jmir1/aniyomi'
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'aniyomiorg/aniyomi'
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ env.VERSION_TAG }}
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/jmir1/aniyomi#issues-feature-requests-and-contributing).
Looking to report an issue/bug or make a feature request? Please refer to the [README file](https://github.com/aniyomiorg/aniyomi#issues-feature-requests-and-contributing).

---

Expand All @@ -9,7 +9,7 @@ Thanks for your interest in contributing to Aniyomi!

Pull requests are welcome!

If you're interested in taking on [an open issue](https://github.com/jmir1/aniyomi/issues), please comment on it so others are aware.
If you're interested in taking on [an open issue](https://github.com/aniyomiorg/aniyomi/issues), please comment on it so others are aware.
You do not need to ask for permission nor an assignment.

## Prerequisites
Expand Down Expand Up @@ -42,9 +42,9 @@ When creating a fork, remember to:
- To avoid confusion with the main app:
- Change the app name
- Change the app icon
- Change or disable the [app update checker](https://github.com/jmir1/aniyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
- Change or disable the [app update checker](https://github.com/aniyomiorg/aniyomi/blob/master/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt)
- To avoid installation conflicts:
- Change the `applicationId` in [`build.gradle.kts`](https://github.com/jmir1/aniyomi/blob/master/app/build.gradle.kts)
- Change the `applicationId` in [`build.gradle.kts`](https://github.com/aniyomiorg/aniyomi/blob/master/app/build.gradle.kts)
- To avoid having your data polluting the main app's analytics and crash report services:
- If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/jmir1/aniyomi/blob/master/app/src/standard/google-services.json) with your own
- If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/jmir1/aniyomi/blob/master/app/build.gradle.kts) with your own
- If you want to use Firebase analytics, replace [`google-services.json`](https://github.com/aniyomiorg/aniyomi/blob/master/app/src/standard/google-services.json) with your own
- If you want to use ACRA crash reporting, replace the `ACRA_URI` endpoint in [`build.gradle.kts`](https://github.com/aniyomiorg/aniyomi/blob/master/app/build.gradle.kts) with your own
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Build | Preview Release | Codefactor | Stable | Translate Aniyomi | Discord Server |
|-------|-----------|-------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------|
| ![CI](https://github.com/jmir1/aniyomi/workflows/CI/badge.svg?branch=master&event=push) | [![latest preview build](https://img.shields.io/github/v/release/jmir1/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/jmir1/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/jmir1/aniyomi/badge)](https://www.codefactor.io/repository/github/jmir1/aniyomi) | [![stable release](https://img.shields.io/github/release/jmir1/aniyomi.svg?maxAge=3600&label=download)](https://github.com/jmir1/aniyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![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/workflows/CI/badge.svg?branch=master&event=push) | [![latest preview build](https://img.shields.io/github/v/release/aniyomiorg/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi/badge)](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi) | [![stable release](https://img.shields.io/github/release/aniyomiorg/aniyomi.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![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
Expand All @@ -9,7 +9,7 @@ Aniyomi is an unofficial fork of the free and open source manga reader [Tachiyom
## Features

Features include:
* Watching anime from [a variety of sources](https://github.com/jmir1/aniyomi-extensions)
* Watching anime from [a variety of sources](https://github.com/aniyomiorg/aniyomi-extensions)
* Everything you know and love about Tachiyomi:
* Online reading from a variety of sources
* Local reading of downloaded content
Expand All @@ -21,17 +21,17 @@ Features include:
* Create backups locally to read offline or to your desired cloud service

## Download
Get the app from the [releases page](https://github.com/jmir1/aniyomi/releases).
Get the app from the [releases page](https://github.com/aniyomiorg/aniyomi/releases).

If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/jmir1/aniyomi-preview/releases).
If you want to try new features before they get to the stable release, you can download the preview version [here](https://github.com/aniyomiorg/aniyomi-preview/releases).

## Issues, Feature Requests and Contributing

Please make sure to read the full guidelines. Your issue may be closed without warning if you do not.

<details><summary>Issues</summary>

1. **Before reporting a new issue, take a look at the already opened [issues](https://github.com/jmir1/aniyomi/issues).**
1. **Before reporting a new issue, take a look at the already opened [issues](https://github.com/aniyomiorg/aniyomi/issues).**
2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR)

</details>
Expand All @@ -57,7 +57,7 @@ DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75
* Write a detailed issue, explaining what it should do or how. Avoid writing just "like X app does"
* Include screenshot (if needed)

Source requests should be created at https://github.com/jmir1/aniyomi-extensions, they do not belong in this repository.
Source requests should be created at https://github.com/aniyomiorg/aniyomi-extensions, they do not belong in this repository.
</details>

<details><summary>Contributing</summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private fun AnimeExtensionContent(
modifier = Modifier
.padding(bottom = MaterialTheme.padding.small)
.clickable {
uriHandler.openUri("https://tachiyomi.org/extensions")
uriHandler.openUri("https://aniyomi.org/extensions")
},
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fun MoreScreen(
WarningBanner(
textRes = R.string.fdroid_warning,
modifier = Modifier.clickable {
uriHandler.openUri("https://tachiyomi.org/help/faq/#how-do-i-migrate-from-the-f-droid-version")
uriHandler.openUri("https://aniyomi.org/help/faq/#how-do-i-migrate-from-the-f-droid-version")
},
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ object AboutScreen : Screen {
LinkIcon(
label = "GitHub",
painter = painterResource(R.drawable.ic_github_24dp),
url = "https://github.com/jmir1/aniyomi",
url = "https://github.com/aniyomiorg/aniyomi",
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ object SettingsTrackingScreen : SearchableSettings {
@Composable
override fun RowScope.AppBarAction() {
val uriHandler = LocalUriHandler.current
IconButton(onClick = { uriHandler.openUri("https://tachiyomi.org/help/guides/tracking/") }) {
IconButton(onClick = { uriHandler.openUri("https://aniyomi.org/help/guides/tracking/") }) {
Icon(
imageVector = Icons.Outlined.HelpOutline,
contentDescription = stringResource(R.string.tracking_guide),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class AnimeLibraryUpdateNotifier(private val context: Context) {

companion object {
// TODO: Change when implemented on Aniyomi website
const val HELP_WARNING_URL = "https://tachiyomi.org/help/faq/#why-does-the-app-warn-about-large-bulk-updates-and-downloads"
const val HELP_WARNING_URL = "https://aniyomi.org/help/faq/#why-does-the-app-warn-about-large-bulk-updates-and-downloads"
}
}

Expand All @@ -349,4 +349,4 @@ private const val NOTIF_ANIME_TITLE_MAX_LEN = 45
private const val NOTIF_ANIME_ICON_SIZE = 192

// TODO: Change when implemented on Aniyomi website
private const val HELP_SKIPPED_ANIME_URL = "https://tachiyomi.org/help/faq/#why-does-global-update-skip-some-entries"
private const val HELP_SKIPPED_ANIME_URL = "https://aniyomi.org/help/faq/#why-does-global-update-skip-some-entries"
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class MangaLibraryUpdateNotifier(private val context: Context) {

companion object {
// TODO: Change when implemented on Aniyomi website
const val HELP_WARNING_URL = "https://tachiyomi.org/help/faq/#why-does-the-app-warn-about-large-bulk-updates-and-downloads"
const val HELP_WARNING_URL = "https://aniyomi.org/help/faq/#why-does-the-app-warn-about-large-bulk-updates-and-downloads"
}
}

Expand All @@ -363,4 +363,4 @@ private const val NOTIF_MANGA_TITLE_MAX_LEN = 45
private const val NOTIF_MANGA_ICON_SIZE = 192

// TODO: Change when implemented on Aniyomi website
private const val HELP_SKIPPED_MANGA_URL = "https://tachiyomi.org/help/faq/#why-does-global-update-skip-some-entries"
private const val HELP_SKIPPED_MANGA_URL = "https://aniyomi.org/help/faq/#why-does-global-update-skip-some-entries"
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ class AppUpdateChecker {
val newVersion = versionTag.replace("[^\\d.]".toRegex(), "")

return if (BuildConfig.PREVIEW) {
// Preview builds: based on releases in "jmir1/tachiyomi-preview" repo
// Preview builds: based on releases in "aniyomiorg/aniyomi-preview" repo
// tagged as something like "r1234"
newVersion.toInt() > BuildConfig.COMMIT_COUNT.toInt()
} else {
// Release builds: based on releases in "jmir1/aniyomi" repo
// Release builds: based on releases in "aniyomiorg/aniyomi" repo
// tagged as something like "v0.1.2"
val oldVersion = BuildConfig.VERSION_NAME.replace("[^\\d.]".toRegex(), "")

Expand All @@ -87,9 +87,9 @@ class AppUpdateChecker {

val GITHUB_REPO: String by lazy {
if (BuildConfig.PREVIEW) {
"jmir1/aniyomi-preview"
"aniyomiorg/aniyomi-preview"
} else {
"jmir1/aniyomi"
"aniyomiorg/aniyomi"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ private fun AnimeExtensionJsonObject.extractLibVersion(): Double {
return version.substringBeforeLast('.').toDouble()
}

private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/jmir1/aniyomi-extensions/repo/"
private const val FALLBACK_REPO_URL_PREFIX = "https://gcore.jsdelivr.net/gh/jmir1/aniyomi-extensions@repo/"
private const val REPO_URL_PREFIX = "https://raw.githubusercontent.com/aniyomiorg/aniyomi-extensions/repo/"
private const val FALLBACK_REPO_URL_PREFIX = "https://gcore.jsdelivr.net/gh/aniyomiorg/aniyomi-extensions@repo/"

@Serializable
private data class AnimeExtensionJsonObject(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get

private const val URL_EXTENSION_COMMITS =
"https://github.com/jmir1/aniyomi-extensions/commits/master"
"https://github.com/aniyomiorg/aniyomi-extensions/commits/master"
private const val URL_EXTENSION_BLOB =
"https://github.com/jmir1/aniyomi-extensions/blob/master"
"https://github.com/aniyomiorg/aniyomi-extensions/blob/master"

class AnimeExtensionDetailsScreenModel(
pkgName: String,
Expand Down Expand Up @@ -102,7 +102,7 @@ class AnimeExtensionDetailsScreenModel(
val extension = state.value.extension ?: return ""

if (!extension.hasReadme) {
return "https://tachiyomi.org/help/faq/#extensions"
return "https://aniyomi.org/help/faq/#extensions"
}

val pkgName = extension.pkgName.substringAfter("eu.kanade.tachiyomi.extension.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class MangaExtensionDetailsScreenModel(
val extension = state.value.extension ?: return ""

if (!extension.hasReadme) {
return "https://tachiyomi.org/help/faq/#extensions"
return "https://aniyomi.org/help/faq/#extensions"
}

val pkgName = extension.pkgName.substringAfter("eu.kanade.tachiyomi.extension.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fun Screen.migrateMangaSourceTab(): TabContent {
title = stringResource(R.string.migration_help_guide),
icon = Icons.Outlined.HelpOutline,
onClick = {
uriHandler.openUri("https://tachiyomi.org/help/guides/source-migration/")
uriHandler.openUri("https://aniyomi.org/help/guides/source-migration/")
},
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ object AnimeLibraryTab : Tab {
EmptyScreenAction(
stringResId = R.string.getting_started_guide,
icon = Icons.Outlined.HelpOutline,
onClick = { handler.openUri("https://tachiyomi.org/help/guides/getting-started") },
onClick = { handler.openUri("https://aniyomi.org/help/guides/getting-started") },
),
),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ object MangaLibraryTab : Tab {
EmptyScreenAction(
stringResId = R.string.getting_started_guide,
icon = Icons.Outlined.HelpOutline,
onClick = { handler.openUri("https://tachiyomi.org/help/guides/getting-started") },
onClick = { handler.openUri("https://aniyomi.org/help/guides/getting-started") },
),
),
)
Expand Down

0 comments on commit 0878797

Please sign in to comment.