Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted image conversion helper to be compatible with the latest egg changes

Browse Source
This commit is contained in:
Marcel Baumgartner
2024-06-29 19:05:41 +02:00
parent fcfbf5a01d
commit 83c40ec417
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Moonlight/Features/Servers/Helpers/ImageConversionHelper.cs
View File

@@ -274,7 +274,17 @@ public class ImageConversionHelper
// Node Regex: As the online detection uses regex, we want to escape any special chars from egg imports // Node Regex: As the online detection uses regex, we want to escape any special chars from egg imports
// as eggs dont use regex and as such may contain characters which regex uses as meta characters. // as eggs dont use regex and as such may contain characters which regex uses as meta characters.
// Without this escaping, many startup detection strings wont work // Without this escaping, many startup detection strings wont work
result.OnlineDetection = Regex.Escape(startup["done"]?.Value<string>() ?? "Online detection was missing");
// As pelican/pterodactyl changed their image format AGAIN, there needs to be the check below
var val = startup["done"]!;
string rawDone;
if (val is JArray array)
rawDone = array.First().Value<string>() ?? "Online detection was missing";
else
rawDone = val.Value<string>() ?? "Online detection was missing";
result.OnlineDetection = Regex.Escape(rawDone);
// Docker images // Docker images