From feb765448b8c5cbae343a5eb52f4287a9b84f102 Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:13:34 +0600 Subject: [PATCH 1/2] [skip ci] Fix: Removed extension lower limit --- .../tachiyomi/extension/api/ExtensionGithubApi.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index 03b6d137..d42ece54 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -91,9 +91,10 @@ internal class ExtensionGithubApi { // Sanity check - a small number of extensions probably means something broke // with the repo generator - if (repoExtensions.size < 10) { - throw Exception() - } + //if (repoExtensions.size < 10) { + // throw Exception() + //} + // No official repo now so this won't be needed anymore. User-made repo can have less than 10 extensions extensions.addAll(repoExtensions) } catch (e: Throwable) { @@ -180,9 +181,10 @@ internal class ExtensionGithubApi { // Sanity check - a small number of extensions probably means something broke // with the repo generator - if (repoExtensions.size < 10) { - throw Exception() - } + //if (repoExtensions.size < 10) { + // throw Exception() + //} + // No official repo now so this won't be needed anymore. User made repo can have less than 10 extensions. extensions.addAll(repoExtensions) } catch (e: Throwable) { From 37ba9341cc70dc680c59f046b4693d8cd0a31ac2 Mon Sep 17 00:00:00 2001 From: ibo <41344259+sneazy-ibo@users.noreply.github.com> Date: Sat, 22 Jun 2024 06:16:19 +0200 Subject: [PATCH 2/2] feat(discord): added hash links + fix trailing --- .github/workflows/beta.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index fe94f80c..1cc4f6bd 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -38,7 +38,7 @@ jobs: fi echo "Commits since $LAST_SHA:" # Accumulate commit logs in a shell variable - COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"● %s ~%an") + COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"[[%h](https://github.com/${{ github.repository }}/commit/%H)] %s ~%an") # Replace commit messages with pull request links COMMIT_LOGS=$(echo "$COMMIT_LOGS" | sed -E 's/#([0-9]+)/[#\1](https:\/\/github.com\/rebelonion\/Dantotsu\/pull\/\1)/g') # URL-encode the newline characters for GitHub Actions @@ -108,9 +108,9 @@ jobs: } # Additional information for the goats declare -A additional_info - additional_info["ibo"]=" Discord: <@951737931159187457>\n AniList: [takarealist112]()" - additional_info["aayush262"]=" Discord: <@918825160654598224>\n AniList: [aayush262]()" - additional_info["rebelonion"]=" Discord: <@714249925248024617>\n AniList: [rebelonion]()\n PornHub: [rebelonion]()" + additional_info["ibo"]=" Discord: <@951737931159187457>\n AniList: [takarealist112]()\n" + additional_info["aayush262"]=" Discord: <@918825160654598224>\n AniList: [aayush262]()\n" + additional_info["rebelonion"]=" Discord: <@714249925248024617>\n AniList: [rebelonion]()\n PornHub: [rebelonion]()\n" # Extract contributor names from commit log and make unique list committers=$(echo "$COMMIT_LOG" | sed 's/%0A/\n/g' | grep -oP '(?<=~)[^%]*') committers=$(echo "$committers" | sort | uniq) @@ -133,8 +133,7 @@ jobs: extra_info=$(echo -e "$extra_info" | sed 's/^/- /') fi developers="${developers}◗ **${name}** - ${extra_info} - - Github: [${login}](https://github.com/${login}) + ${extra_info} Github: [${login}](https://github.com/${login}) - Commits: ${commits} " committers_count=$((committers_count + 1))