From ac24c1f6344b10037c04522bcfe209443a707e22 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Sat, 25 Jan 2025 12:51:48 +0000 Subject: [PATCH] chore: update discord release message and info --- .github/workflows/release-please.yml | 3 --- discord.gradle | 16 ++++++++++++---- legacyspigot/build.gradle | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 70f74ba6..7a6b5152 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -31,9 +31,6 @@ jobs: - project: legacyspigot java-version: 8 release-task: curseforge - - project: legacyspigot - java-version: 8 - release-task: discordupload - project: legacyspigot java-version: 8 release-task: modrinth diff --git a/discord.gradle b/discord.gradle index fc27988b..f6eb6ce7 100644 --- a/discord.gradle +++ b/discord.gradle @@ -46,20 +46,28 @@ task discordupload { def content = "# New release build\n" + "${getReleaseChangelog()}\n" - if (content.length() > maxLength) { - def afterMessage = "[See more on GitHub]()" + def downloadLink = "\n\n[Download here](https://modrinth.com/plugin/advanced-portals)" + + if(isRelease && content.length() + downloadLink.length() <= maxLength) { + content += downloadLink + } + + if (content.length() + downloadLink.length() > maxLength) { + def afterMessage = "[See more on GitHub]()\n\n" def truncatedContent = content.replaceAll(/(http[s]?:\/\/[^\s)]+)/, '<$1>').take(maxLength - afterMessage.length() - 1) def lastFullLine = truncatedContent.lastIndexOf("\n") content = "${truncatedContent.take(lastFullLine)}\n" content += afterMessage - + content += downloadLink } builder.addTextBody("content", content, ContentType.create("text/plain", "UTF-8")) } - builder.addBinaryBody("file", file(jar.archiveFile).newInputStream(), ContentType.APPLICATION_OCTET_STREAM, jar.archiveName) + if(!isRelease) { + builder.addBinaryBody("file", file(jar.archiveFile).newInputStream(), ContentType.APPLICATION_OCTET_STREAM, jar.archiveName) + } HttpEntity multipart = builder.build() diff --git a/legacyspigot/build.gradle b/legacyspigot/build.gradle index f4fe6285..185d9ccd 100644 --- a/legacyspigot/build.gradle +++ b/legacyspigot/build.gradle @@ -206,7 +206,7 @@ modrinth { loaders = ["spigot", "bukkit", "paper", "velocity", "waterfall", "bungeecord", "purpur"] gameVersions = supportedVersions changelog = getReleaseChangelog() - versionName = "Legacy Spigot [MC 1.8.8 - 1.12.2] " + getVersion() + versionName = "Legacy Spigot [MC 1.8.8 - 1.12.2] d" + getVersion() versionNumber = getVersion() + "-LegacySpigot" syncBodyFrom = rootProject.file("README.md").text }