diff --git a/.github/workflows/discord-release-embed.php b/.github/workflows/discord-release-embed.php index 41ef89878..9bcb41bc8 100644 --- a/.github/workflows/discord-release-embed.php +++ b/.github/workflows/discord-release-embed.php @@ -18,8 +18,9 @@ require dirname(__DIR__, 2) . '/vendor/autoload.php'; /** * @phpstan-return array */ -function generateDiscordEmbed(string $version, string $channel, string $description, string $detailsUrl, string $sourceUrl, string $pharDownloadUrl, string $buildLogUrl) : array{ +function generateDiscordEmbed(string $version, string $channel, string $description, string $detailsUrl, string $sourceUrl, string $pharDownloadUrl, string $buildLogUrl, int $newsPingRoleId) : array{ return [ + "content" => "<@&$newsPingRoleId> New PocketMine-MP release: $version ($channel)", "embeds" => [ [ "title" => "New PocketMine-MP release: $version ($channel)", @@ -35,11 +36,11 @@ DESCRIPTION, ]; } -if(count($argv) !== 5){ - fwrite(STDERR, "Required arguments: github repo, version, API token\n"); +if(count($argv) !== 6){ + fwrite(STDERR, "Required arguments: github repo, version, API token, webhook URL, ping role ID\n"); exit(1); } -[, $repo, $tagName, $token, $hookURL] = $argv; +[, $repo, $tagName, $token, $hookURL, $newsPingRoleId] = $argv; $result = Internet::getURL('https://api.github.com/repos/' . $repo . '/releases/tags/' . $tagName, extraHeaders: [ 'Authorization: token ' . $token @@ -86,7 +87,7 @@ $buildLogUrl = $buildInfoJson["build_log_url"]; $description = $releaseInfoJson["body"]; -$discordPayload = generateDiscordEmbed($buildInfoJson["base_version"], $buildInfoJson["channel"], $description, $detailsUrl, $sourceUrl, $pharDownloadUrl, $buildLogUrl); +$discordPayload = generateDiscordEmbed($buildInfoJson["base_version"], $buildInfoJson["channel"], $description, $detailsUrl, $sourceUrl, $pharDownloadUrl, $buildLogUrl, (int) $newsPingRoleId); $response = Internet::postURL( $hookURL, diff --git a/.github/workflows/discord-release-notify.yml b/.github/workflows/discord-release-notify.yml index 91fb4c83e..2a5cadf2d 100644 --- a/.github/workflows/discord-release-notify.yml +++ b/.github/workflows/discord-release-notify.yml @@ -35,4 +35,4 @@ jobs: run: echo ::set-output name=TAG_NAME::$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{') - name: Run webhook post script - run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }} + run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }} ${{ secrets.DISCORD_NEWS_PING_ROLE_ID }}