Lightemerald/Dantotsu
1
0
Fork 0
mirror of https://github.com/rebelonion/Dantotsu.git synced 2026-01-30 23:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
ibo
2024-06-24 06:27:13 +02:00
committed by GitHub
parent 64dc2d1b6c 37ba9341cc
commit bcbd7944bc
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/beta.yml vendored
View File

@@ -117,10 +117,9 @@ jobs:
while read -r count name; do while read -r count name; do
recent_commit_counts["$name"]=$count recent_commit_counts["$name"]=$count
done < <(echo "$COMMIT_LOG" | sed 's/%0A/\n/g' | grep -oP '(?<=~)[^[]*' | sort | uniq -c | sort -rn) done < <(echo "$COMMIT_LOG" | sed 's/%0A/\n/g' | grep -oP '(?<=~)[^[]*' | sort | uniq -c | sort -rn)
# Fetch contributors from GitHub # Fetch contributors from GitHub
contributors=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ contributors=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/Dantotsu-inc/FUCKYML/contributors") "https://api.github.com/repos/rebelonion/Dantotsu/contributors")
# Create a sorted list of contributors based on recent commit counts # Create a sorted list of contributors based on recent commit counts
sorted_contributors=$(for login in $(echo "$contributors" | jq -r '.[].login'); do sorted_contributors=$(for login in $(echo "$contributors" | jq -r '.[].login'); do
@@ -251,17 +250,15 @@ jobs:
echo "Skipping APK upload to Discord due to SKIP_BUILDING_APK being set to true" echo "Skipping APK upload to Discord due to SKIP_BUILDING_APK being set to true"
fi fi
# Format commit messages for Telegram (HTML format with quote) # Format commit messages for Telegram
telegram_commit_messages=$(echo "$COMMIT_LOG" | sed 's/%0A/\n/g' | while read -r line; do telegram_commit_messages=$(echo "$COMMIT_LOG" | sed 's/%0A/\n/g' | while read -r line; do
message=$(echo "$line" | sed -E 's/● (.*) ~(.*) \[֍\]\((.*)\)/● \1 ~\2 <a href="\3">֍<\/a>/') message=$(echo "$line" | sed -E 's/● (.*) ~(.*) \[֍\]\((.*)\)/● \1 ~\2 <a href="\3">֍<\/a>/')
message=$(echo "$message" | sed -E 's/\[#([0-9]+)\]\((https:\/\/github\.com\/[^)]+)\)/<a href="\2">#\1<\/a>/g') message=$(echo "$message" | sed -E 's/\[#([0-9]+)\]\((https:\/\/github\.com\/[^)]+)\)/<a href="\2">#\1<\/a>/g')
echo "$message" echo "$message"
done) done)
# Wrap commit messages in a blockquote for proper quote effect
telegram_commit_messages="<blockquote>${telegram_commit_messages}</blockquote>" telegram_commit_messages="<blockquote>${telegram_commit_messages}</blockquote>"
# Send Telegram message with APK upload # Upload APK to Telegram
if [ "$SKIP_BUILDING_APK" != "true" ]; then if [ "$SKIP_BUILDING_APK" != "true" ]; then
APK_PATH="app/build/outputs/apk/google/alpha/app-google-alpha.apk" APK_PATH="app/build/outputs/apk/google/alpha/app-google-alpha.apk"
response=$(curl -sS -f -X POST \ response=$(curl -sS -f -X POST \
@@ -276,6 +273,7 @@ jobs:
else else
echo "Skipping Telegram message and APK upload due to SKIP_BUILDING_APK being set to true" echo "Skipping Telegram message and APK upload due to SKIP_BUILDING_APK being set to true"
fi fi
env: env:
COMMIT_LOG: ${{ env.COMMIT_LOG }} COMMIT_LOG: ${{ env.COMMIT_LOG }}
VERSION: ${{ env.VERSION }} VERSION: ${{ env.VERSION }}

14
app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
View File

@@ -91,9 +91,10 @@ internal class ExtensionGithubApi {
// Sanity check - a small number of extensions probably means something broke // Sanity check - a small number of extensions probably means something broke
// with the repo generator // with the repo generator
if (repoExtensions.size < 10) { //if (repoExtensions.size < 10) {
throw Exception() // 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) extensions.addAll(repoExtensions)
} catch (e: Throwable) { } catch (e: Throwable) {
@@ -180,9 +181,10 @@ internal class ExtensionGithubApi {
// Sanity check - a small number of extensions probably means something broke // Sanity check - a small number of extensions probably means something broke
// with the repo generator // with the repo generator
if (repoExtensions.size < 10) { //if (repoExtensions.size < 10) {
throw Exception() // 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) extensions.addAll(repoExtensions)
} catch (e: Throwable) { } catch (e: Throwable) {