Compare commits

...
4 Commits
99 ... 104
3 changed files with 288 additions and 10 deletions
+152 -9
View File
@@ -16,8 +16,8 @@ jobs:
steps: steps:
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
distribution: "zulu" distribution: 'zulu'
java-version: "17" java-version: '17'
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -175,7 +175,7 @@ jobs:
**Download Links:** **Download Links:**
" "
MODULES_MSG=" MODULES_MSG="
**Modules:** **Modules:**
${MODULES} ${MODULES}
@@ -189,15 +189,15 @@ jobs:
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-d "$(jq -n --arg content "$MSG" '{content: $content}')" \ -d "$(jq -n --arg content "$MSG" '{content: $content}')" \
"$DISCORD_WEBHOOK_URL" "$DISCORD_WEBHOOK_URL"
# curl -X POST -H "Content-Type: application/json" \ # curl -X POST -H "Content-Type: application/json" \
# -d "$(jq -n --arg content "$MODULES_MSG" '{content: $content}')" \ # -d "$(jq -n --arg content "$MODULES_MSG" '{content: $content}')" \
# "$DISCORD_WEBHOOK_URL" # "$DISCORD_WEBHOOK_URL"
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-d "$(jq -n --arg content "$APKS_MSG" '{content: $content}')" \ -d "$(jq -n --arg content "$APKS_MSG" '{content: $content}')" \
"$DISCORD_WEBHOOK_URL" "$DISCORD_WEBHOOK_URL"
- name: Report to Noob Discord - name: Report to Noob Discord
env: env:
DISCORD_WEBHOOK_NOOB_URL: ${{ secrets.DISCORD_WEBHOOK_NOOB_URL }} DISCORD_WEBHOOK_NOOB_URL: ${{ secrets.DISCORD_WEBHOOK_NOOB_URL }}
@@ -227,7 +227,7 @@ jobs:
**Download Links:** **Download Links:**
" "
MODULES_MSG=" MODULES_MSG="
**Modules:** **Modules:**
${MODULES} ${MODULES}
@@ -241,11 +241,154 @@ jobs:
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-d "$(jq -n --arg content "$MSG" '{content: $content}')" \ -d "$(jq -n --arg content "$MSG" '{content: $content}')" \
"$DISCORD_WEBHOOK_NOOB_URL" "$DISCORD_WEBHOOK_NOOB_URL"
# curl -X POST -H "Content-Type: application/json" \ # curl -X POST -H "Content-Type: application/json" \
# -d "$(jq -n --arg content "$MODULES_MSG" '{content: $content}')" \ # -d "$(jq -n --arg content "$MODULES_MSG" '{content: $content}')" \
# "$DISCORD_WEBHOOK_NOOB_URL" # "$DISCORD_WEBHOOK_NOOB_URL"
curl -X POST -H "Content-Type: application/json" \ curl -X POST -H "Content-Type: application/json" \
-d "$(jq -n --arg content "$APKS_MSG" '{content: $content}')" \ -d "$(jq -n --arg content "$APKS_MSG" '{content: $content}')" \
"$DISCORD_WEBHOOK_NOOB_URL" "$DISCORD_WEBHOOK_NOOB_URL"
- name: Send Email Notification (Resend)
env:
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
MAIL_TO: ${{ secrets.MAIL_TO }}
MAIL_CC: ${{ secrets.MAIL_CC }}
MAIL_BCC: ${{ secrets.MAIL_BCC }}
MAIL_FROM: ${{ secrets.MAIL_FROM }}
if: env.RESEND_API_KEY != null && env.MAIL_TO != null
run: |
VERSION="${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}"
RELEASE_URL="${{ github.server_url }}/${{ github.repository }}/releases/tag/${VERSION}"
REPO="${{ github.repository }}"
# Set default FROM address if not provided
FROM_ADDRESS="${MAIL_FROM:-ReVanced Build Bot <onboarding@resend.dev>}"
# Build download links from build folder (separate APKs and Modules)
cd build || { echo "build folder not found"; exit 1; }
APK_LINKS=""
MODULE_LINKS=""
for OUTPUT in *; do
DL_URL="${{ github.server_url }}/${{ github.repository }}/releases/download/${VERSION}/${OUTPUT}"
if [[ $OUTPUT = *.apk ]]; then
APK_LINKS+="<li style=\"margin: 8px 0;\">📦 <a href=\"${DL_URL}\" style=\"color: #667eea; text-decoration: none;\">${OUTPUT}</a></li>"
elif [[ $OUTPUT = *.zip ]]; then
MODULE_LINKS+="<li style=\"margin: 8px 0;\">📁 <a href=\"${DL_URL}\" style=\"color: #667eea; text-decoration: none;\">${OUTPUT}</a></li>"
fi
done
cd ..
# Get current time in Vietnam timezone (UTC+7)
BUILD_TIME=$(TZ='Asia/Ho_Chi_Minh' date '+%Y-%m-%d %H:%M:%S (UTC+7)')
# Get changelog from build.md and convert to HTML
if [ -f "build.md" ]; then
# Convert markdown to simple HTML
CHANGELOG_HTML=$(sed 's/^### \(.*\)/<h3 style="color: #667eea; font-size: 16px; margin: 15px 0 8px 0;">\1<\/h3>/g;
s/^\* \*\*\(.*\)\*\*/<li style="margin: 5px 0;"><strong>\1<\/strong><\/li>/g;
s/^\* \(.*\)/<li style="margin: 5px 0;">\1<\/li>/g;
s/^- \(.*\)/<li style="margin: 5px 0;">\1<\/li>/g;
s/`\([^`]*\)`/<code style="background: #e9ecef; padding: 2px 6px; border-radius: 3px; font-size: 13px;">\1<\/code>/g;
/^==/d;
/^$/d' build.md | tr '\n' ' ')
else
CHANGELOG_HTML="<p>No changelog available.</p>"
fi
# Create HTML email body (similar structure to Telegram)
HTML_BODY=$(cat <<EOF
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 0;">
<div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 30px; text-align: center;">
<h1 style="margin: 0;">🎉 New ReVanced Build!</h1>
<p style="margin: 10px 0 0 0; font-size: 18px;">Version: v${VERSION}</p>
<p style="margin: 5px 0 0 0; font-size: 14px; opacity: 0.9;">🕐 ${BUILD_TIME}</p>
</div>
<div style="padding: 25px; background: #f9f9f9;">
<!-- Changelog Section -->
<div style="margin-bottom: 25px; background: white; padding: 20px; border-radius: 8px; border-left: 4px solid #667eea;">
<h2 style="color: #667eea; font-size: 18px; margin: 0 0 15px 0;">📋 Changelog</h2>
<div style="font-size: 14px;">
${CHANGELOG_HTML}
</div>
</div>
<!-- Download Links Section -->
<div style="margin-bottom: 25px; background: white; padding: 20px; border-radius: 8px;">
<h2 style="color: #667eea; font-size: 18px; margin: 0 0 15px 0;"> Download Links</h2>
<!-- Modules -->
$(if [ -n "$MODULE_LINKS" ]; then echo "
<div style=\"margin-bottom: 15px;\">
<h3 style=\"color: #555; font-size: 15px; margin: 0 0 10px 0;\"> Modules:</h3>
<ul style=\"list-style: none; padding: 0; margin: 0;\">
${MODULE_LINKS}
</ul>
</div>
"; fi)
<!-- APKs -->
$(if [ -n "$APK_LINKS" ]; then echo "
<div>
<h3 style=\"color: #555; font-size: 15px; margin: 0 0 10px 0;\">📱 APKs:</h3>
<ul style=\"list-style: none; padding: 0; margin: 0;\">
${APK_LINKS}
</ul>
</div>
"; fi)
</div>
<!-- GitHub Button -->
<div style="text-align: center;">
<a href="${RELEASE_URL}" style="display: inline-block; background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 12px 30px; text-decoration: none; border-radius: 25px; font-weight: bold;">
View Release on GitHub
</a>
</div>
</div>
<div style="text-align: center; padding: 20px; background: #333; color: #999; font-size: 12px;">
<p style="margin: 0;">This is an automated message from ReVanced Build Bot</p>
<p style="margin: 5px 0 0 0;">Repository: ${REPO}</p>
</div>
</body>
</html>
EOF
)
# Build JSON payload with TO, CC and BCC recipients
# Resend allows up to 50 recipients per field (to, cc, bcc)
JSON_PAYLOAD=$(jq -n \
--arg from "$FROM_ADDRESS" \
--arg to "$MAIL_TO" \
--arg cc "$MAIL_CC" \
--arg bcc "$MAIL_BCC" \
--arg subject "🚀 New ReVanced Build Available - v${VERSION}" \
--arg html "$HTML_BODY" \
'{
from: $from,
to: ($to | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; ""))),
subject: $subject,
html: $html
}
+ (if $cc != "" then {cc: ($cc | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; "")))} else {} end)
+ (if $bcc != "" then {bcc: ($bcc | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; "")))} else {} end)'
)
echo "📧 Sending email notification..."
# Send email via Resend API
RESPONSE=$(curl -s -X POST "https://api.resend.com/emails" \
-H "Authorization: Bearer ${RESEND_API_KEY}" \
-H "Content-Type: application/json" \
-d "$JSON_PAYLOAD")
echo "Response: $RESPONSE"
echo "✅ Email sent successfully!"
+127
View File
@@ -0,0 +1,127 @@
name: Email Notification Test
on:
workflow_dispatch:
inputs:
recipient_email:
description: 'Email address to send test to (leave empty to use MAIL_TO secret)'
required: false
type: string
jobs:
send-test-email:
runs-on: ubuntu-latest
steps:
- name: Send Test Email (Resend)
env:
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
MAIL_TO: ${{ inputs.recipient_email || secrets.MAIL_TO }}
MAIL_CC: ${{ secrets.MAIL_CC }}
MAIL_BCC: ${{ secrets.MAIL_BCC }}
MAIL_FROM: ${{ secrets.MAIL_FROM }}
run: |
if [ -z "$RESEND_API_KEY" ]; then
echo "❌ Error: RESEND_API_KEY secret is not set!"
exit 1
fi
if [ -z "$MAIL_TO" ]; then
echo "❌ Error: No email recipient specified!"
echo "Either provide recipient_email input or set MAIL_TO secret."
exit 1
fi
# Set default FROM address if not provided
FROM_ADDRESS="${MAIL_FROM:-ReVanced Build Bot <onboarding@resend.dev>}"
# Use Vietnam timezone (UTC+7)
VERSION="TEST-$(TZ='Asia/Ho_Chi_Minh' date +%Y%m%d-%H%M%S)"
SENT_TIME=$(TZ='Asia/Ho_Chi_Minh' date '+%Y-%m-%d %H:%M:%S (UTC+7)')
RELEASE_URL="${{ github.server_url }}/${{ github.repository }}/releases"
REPO="${{ github.repository }}"
# Create test HTML email body
HTML_BODY=$(cat <<EOF
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 0;">
<div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 30px; text-align: center;">
<h1 style="margin: 0;">🧪 Test Email</h1>
<p style="margin: 10px 0 0 0; font-size: 18px;">Version: ${VERSION}</p>
</div>
<div style="padding: 25px; background: #f9f9f9;">
<div style="margin-bottom: 25px;">
<h2 style="color: #667eea; font-size: 18px; margin: 0 0 10px 0;">✅ Email Configuration Working!</h2>
<p style="margin: 0;">If you received this email, it means your Resend configuration is working correctly!</p>
</div>
<div style="margin-bottom: 25px;">
<h2 style="color: #667eea; font-size: 18px; margin: 0 0 10px 0;">📋 Configuration Details</h2>
<ul style="list-style: none; padding: 0; margin: 0;">
<li>📧 From: ${FROM_ADDRESS}</li>
<li>📬 To: ${MAIL_TO}</li>
<li>🕐 Sent at: ${SENT_TIME}</li>
</ul>
</div>
<div style="margin-bottom: 25px; text-align: center;">
<a href="${RELEASE_URL}" style="display: inline-block; background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 12px 30px; text-decoration: none; border-radius: 25px; font-weight: bold;">
View Releases
</a>
</div>
</div>
<div style="text-align: center; padding: 20px; background: #333; color: #999; font-size: 12px;">
<p style="margin: 0;">This is a TEST email from ReVanced Build Bot</p>
<p style="margin: 5px 0 0 0;">Repository: ${REPO}</p>
</div>
</body>
</html>
EOF
)
# Build JSON payload
JSON_PAYLOAD=$(jq -n \
--arg from "$FROM_ADDRESS" \
--arg to "$MAIL_TO" \
--arg cc "$MAIL_CC" \
--arg bcc "$MAIL_BCC" \
--arg subject "🧪 [TEST] ReVanced Build Email - ${VERSION}" \
--arg html "$HTML_BODY" \
'{
from: $from,
to: ($to | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; ""))),
subject: $subject,
html: $html
}
+ (if $cc != "" then {cc: ($cc | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; "")))} else {} end)
+ (if $bcc != "" then {bcc: ($bcc | split(",") | map(select(. != "") | gsub("^\\s+|\\s+$"; "")))} else {} end)'
)
echo "📧 Sending test email to: $MAIL_TO"
if [ -n "$MAIL_CC" ]; then echo "📋 CC: $MAIL_CC"; fi
if [ -n "$MAIL_BCC" ]; then echo "🔒 BCC: $MAIL_BCC"; fi
echo ""
# Send email via Resend API
RESPONSE=$(curl -s -w "\n%{http_code}" -X POST "https://api.resend.com/emails" \
-H "Authorization: Bearer ${RESEND_API_KEY}" \
-H "Content-Type: application/json" \
-d "$JSON_PAYLOAD")
HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
BODY=$(echo "$RESPONSE" | sed '$d')
echo "Response: $BODY"
echo "HTTP Code: $HTTP_CODE"
if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
echo ""
echo "✅ Test email sent successfully!"
echo "📬 Check your inbox at: $MAIL_TO"
else
echo ""
echo "❌ Failed to send email!"
echo "Please check your RESEND_API_KEY and email addresses."
exit 1
fi
+9 -1
View File
@@ -99,7 +99,15 @@ get_rv_prebuilts() {
resp=$(gh_req "$rv_rel" -) || return 1 resp=$(gh_req "$rv_rel" -) || return 1
if [ "$ver" = "dev" ]; then resp=$(jq -r '.[0]' <<<"$resp"); fi if [ "$ver" = "dev" ]; then resp=$(jq -r '.[0]' <<<"$resp"); fi
tag_name=$(jq -r '.tag_name' <<<"$resp") tag_name=$(jq -r '.tag_name' <<<"$resp")
asset=$(jq -e -r ".assets[] | select(.name | endswith(\"$ext\"))" <<<"$resp") || return 1 # Filter assets by extension and handle multiple matches
# Use jq array syntax to get first match as a complete JSON object
if [ "$ver" = "dev" ]; then
# For dev version, prefer the one with "dev" in the name
asset=$(jq -e -r "[.assets[] | select(.name | endswith(\"$ext\") and contains(\"dev\"))][0] // [.assets[] | select(.name | endswith(\"$ext\"))][0]" <<<"$resp") || return 1
else
# For non-dev versions, exclude dev builds and take the first match
asset=$(jq -e -r "[.assets[] | select(.name | endswith(\"$ext\") and (contains(\"dev\") | not))][0] // [.assets[] | select(.name | endswith(\"$ext\"))][0]" <<<"$resp") || return 1
fi
url=$(jq -r .url <<<"$asset") url=$(jq -r .url <<<"$asset")
name=$(jq -r .name <<<"$asset") name=$(jq -r .name <<<"$asset")
file="${dir}/${name}" file="${dir}/${name}"