From c106c46cb48879f1d8689943b19742cd12db858e Mon Sep 17 00:00:00 2001 From: IThundxr Date: Mon, 31 Jul 2023 21:44:48 -0400 Subject: [PATCH] should fix upstream maven naming changes Signed-off-by: IThundxr --- src/webserver/github.ts | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/webserver/github.ts b/src/webserver/github.ts index 67c7553..3446d6f 100644 --- a/src/webserver/github.ts +++ b/src/webserver/github.ts @@ -150,10 +150,18 @@ const actionCompleted = async (client: Client, req: Request) => { 'minecraft' ); - const versionFabric = `${mod_version}+fabric-mc${minecraft_version}-build.${workflow_run.run_number}`; - const versionForge = `${mod_version}+forge-mc${minecraft_version}-build.${workflow_run.run_number}`; - const fabricJar = `${process.env.MAVEN_REPO}${versionFabric}/Steam_Rails-${versionFabric}.jar`; - const forgeJar = `${process.env.MAVEN_REPO}${versionForge}/Steam_Rails-${versionForge}.jar`; + const fabricJar = generateMavenUrl( + mod_version, + minecraft_version, + workflow_run.run_number, + 'fabric' + ); + const forgeJar = generateMavenUrl( + mod_version, + minecraft_version, + workflow_run.run_number, + 'forge' + ); const fabricButton = new ButtonBuilder() .setStyle(ButtonStyle.Link) @@ -177,6 +185,17 @@ const actionCompleted = async (client: Client, req: Request) => { } }; +const generateMavenUrl = ( + mod_version: string, + minecraft_version: string, + run_number: string, + loaderType: string +) => { + const baseRepo = process.env.MAVEN_REPO; + const modVersion = `${mod_version}+${loaderType}-mc${minecraft_version}-build.${run_number}`; + return `${baseRepo}/Steam_Rails-${loaderType}/${modVersion}/Steam_Rails-${loaderType}-${modVersion}.jar`; +}; + const generateCommitsString = (head_sha: string) => { if (!commitMap.get(head_sha)) { return 'No commits found';