From 11b0b2cee650a5c66434cf12614d969e6509bbba Mon Sep 17 00:00:00 2001 From: Refringe Date: Mon, 11 Mar 2024 12:28:18 -0400 Subject: [PATCH] Use jq to construct the JSON for the request. --- .gitea/workflows/build.yaml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 778ec58..efa9037 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -502,8 +502,31 @@ jobs: EMBED_DESCRIPTION="A new stable release build is now ready for download. 7-Zip is *required* to extract the release." fi - curl -i -H "Content-Type: application/json" \ + curl -H "Content-Type: application/json" \ -X POST \ - -d "{\"username\": \"BuildBot\", \"avatar_url\": \"https://i.imgur.com/28JJJec.png\", \"content\": \"✨ **New Build Available!** ✨ (THIS IS A TEST)\", \"embeds\": [{\"title\": \"$EMBED_TITLE\", \"description\": \"$EMBED_DESCRIPTION\\n\\n**Build Name:**\\n$BUILD_NAME\\n\\n🚀 **Primary Download Link:**\\n$DOWNLOAD_LINK\\n\\n🔗 **Torrent Link:**\\n$TORRENT_LINK\\n\\n🧲 **Torrent Magnet Link:**\\n$MAGNET_LINK\\n\\n**Mirrors:**\\n\\n🚧 In order to conserve bandwidth, please consider using the *above* methods to download the release. If you have issues using those methods, you're free to download using any of the following HTTP mirrors.\\n\\n🚧 While the links *below* are not secret, **do not advertise them**. The primary MEGA link or torrent should be used to advertise any downloads.\\n\\n$DOWNLOAD_LINK\", \"url\": \"$DOWNLOAD_LINK\", \"color\": $EMBED_COLOR, \"footer\": {\"text\": \"$FOOTER_MESSAGE\"}, \"timestamp\": \"$TIMESTAMP\"}]}" \ - $DISCORD_WEBHOOK_URL + "$DISCORD_WEBHOOK_URL" \ + --data "$(jq -n --arg EMBED_TITLE "$EMBED_TITLE" \ + --arg EMBED_DESCRIPTION "$EMBED_DESCRIPTION" \ + --arg BUILD_NAME "$BUILD_NAME" \ + --arg DOWNLOAD_LINK "$DOWNLOAD_LINK" \ + --arg TORRENT_LINK "$TORRENT_LINK" \ + --arg MAGNET_LINK "$MAGNET_LINK" \ + --argjson EMBED_COLOR $EMBED_COLOR \ + --arg FOOTER_MESSAGE "$FOOTER_MESSAGE" \ + --arg TIMESTAMP "$TIMESTAMP" \ + '{ + username: "BuildBot", + avatar_url: "https://i.imgur.com/28JJJec.png", + content: "✨ **New Build Available!** ✨ (THIS IS A TEST)", + embeds: [ + { + title: $EMBED_TITLE, + description: ($EMBED_DESCRIPTION + "\n\n**Build Name:**\n" + $BUILD_NAME + "\n\n🚀 **Primary Download Link:**\n" + $DOWNLOAD_LINK + "\n\n🔗 **Torrent Link:**\n" + $TORRENT_LINK + "\n\n🧲 **Torrent Magnet Link:**\n" + $MAGNET_LINK + "\n\n**Mirrors:**\n\n🚧 In order to conserve bandwidth, please consider using the *above* methods to download the release. If you have issues using those methods, you\'re free to download using any of the following HTTP mirrors.\n\n🚧 While the links *below* are not secret, **do not advertise them**. The primary MEGA link or torrent should be used to advertise any downloads.\n\n" + $DOWNLOAD_LINK), + url: $DOWNLOAD_LINK, + color: $EMBED_COLOR, + footer: { text: $FOOTER_MESSAGE }, + timestamp: $TIMESTAMP + } + ] + }')" shell: bash