From c5b9305d42b88848de3e2c43a22942d2436df8ab Mon Sep 17 00:00:00 2001
From: Swedz <me@swedz.net>
Date: Sun, 8 Sep 2024 00:28:38 -0400
Subject: [PATCH] Update changelog trimming

---
 .github/workflows/deploy.yml           | 7 ++++++-
 .github/workflows/discord_message.json | 2 +-
 build.gradle                           | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bd72aab6..213a7a17 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -32,10 +32,15 @@ jobs:
           echo "MOD_VERSION=$(echo "$GITHUB_RELEASE_TAG_NAME" | sed -E 's/-[^-]+$//')" >> $GITHUB_ENV
           echo "RELEASE_TYPE=$(echo "$GITHUB_RELEASE_TAG_NAME" | grep -oE '(alpha|beta)' || echo "release")" >> $GITHUB_ENV
           {
-            echo "MOD_CHANGELOG_TRIMMED<<EOF"
+            echo "MOD_CHANGELOG_TRIMMED_DISCORD<<EOF"
             echo "$(echo "$MOD_CHANGELOG" | sed '/## What'"'"'s Changed/d' | sed 's/## New Contributors/**New Contributors**/g' | sed -E 's/@([a-zA-Z0-9_]+)/`\@\1`/g' | sed -E 's|https://github.com/([^ ]+)/pull/([0-9]+)|[#\2](https://github.com/\1/pull/\2)|g' | sed -E 's|\*\*Full Changelog\*\*: (https://github.com/[^ ]+/compare/[^\s]+)|[Full Changelog](\1)|g' | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')"
             echo "EOF"
           } >> $GITHUB_ENV
+          {
+            echo "MOD_CHANGELOG_TRIMMED_PUBLISH<<EOF"
+            echo "$(echo "$MOD_CHANGELOG" | sed -E 's/@([a-zA-Z0-9_]+)/`\@\1`/g' | sed -E 's|https://github.com/([^ ]+)/pull/([0-9]+)|[#\2](https://github.com/\1/pull/\2)|g' | sed -E 's|\*\*Full Changelog\*\*: (https://github.com/[^ ]+/compare/[^\s]+)|[Full Changelog](\1)|g' | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')"
+            echo "EOF"
+          } >> $GITHUB_ENV
       - name: Finalize variables
         run: |
           echo "MOD_VERSION_SHORT=${MOD_VERSION%%-*}" >> $GITHUB_ENV
diff --git a/.github/workflows/discord_message.json b/.github/workflows/discord_message.json
index 88fdcf1c..26b04910 100644
--- a/.github/workflows/discord_message.json
+++ b/.github/workflows/discord_message.json
@@ -24,7 +24,7 @@
                 {
                     "id": 205983055,
                     "name": "Changelog",
-                    "value": "$MOD_CHANGELOG_TRIMMED",
+                    "value": "$MOD_CHANGELOG_TRIMMED_DISCORD",
                     "inline": false
                 },
                 {
diff --git a/build.gradle b/build.gradle
index 0f73f838..1dbac450 100644
--- a/build.gradle
+++ b/build.gradle
@@ -112,7 +112,7 @@ if (System.getenv("CURSEFORGE_API_KEY")) {
             id = project.curseforge_project
             releaseType = System.getenv("RELEASE_TYPE")
             changelogType = "markdown"
-            delegate.changelog = System.getenv("MOD_CHANGELOG")
+            delegate.changelog = System.getenv("MOD_CHANGELOG_TRIMMED_PUBLISH")
 
             def compatible_minecraft_versions = project.compatible_minecraft_versions.split(",")
             compatible_minecraft_versions.each { addGameVersion it }
@@ -140,7 +140,7 @@ if (System.getenv("MODRINTH_API_KEY")) {
         versionNumber = "${version}"
         versionName = "${project.mod_name} ${version}"
 		versionType = System.getenv("RELEASE_TYPE")
-        delegate.changelog = System.getenv("MOD_CHANGELOG")
+        delegate.changelog = System.getenv("MOD_CHANGELOG_TRIMMED_PUBLISH")
 
         gameVersions = project.compatible_minecraft_versions.split(",").collect { it }
 		loaders = ["neoforge"]