Merge branch 'master' into dev

tgstation · Mar 28, 2024 · 905db37 · 905db37
2 parents 04fd02c + aba366d
commit 905db37
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/rerun-flaky-tests.yml b/.github/workflows/rerun-flaky-tests.yml
@@ -6,6 +6,7 @@ on:
     - completed
 jobs:
   rerun_flaky_tests:
+    name: Rerun Flaky Tests
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
     steps:

diff --git a/.github/workflows/scripts/package.json b/.github/workflows/scripts/package.json
@@ -0,0 +1,3 @@
+{
+	"type": "module"
+}
diff --git a/build/Version.props b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.4.0</TgsCoreVersion>
+    <TgsCoreVersion>6.4.1</TgsCoreVersion>
     <TgsConfigVersion>5.1.0</TgsConfigVersion>
     <TgsApiVersion>10.2.0</TgsApiVersion>
     <TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>

diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
@@ -839,7 +839,7 @@ ValueTask TextReply(string reply) => SendMessage(
 				splits.RemoveAt(0);
 				var arguments = String.Join(" ", splits);
 
-				Tuple<ICommand, IChatTrackingContext?>? GetCommand()
+				Tuple<ICommand, IChatTrackingContext?>? GetCommand(string command)
 				{
 					if (!builtinCommands.TryGetValue(command, out var handler))
 						return trackingContexts
@@ -867,7 +867,7 @@ ValueTask TextReply(string reply) => SendMessage(
 					}
 					else
 					{
-						var helpTuple = GetCommand();
+						var helpTuple = GetCommand(splits[0]);
 						if (helpTuple != default)
 						{
 							var (helpHandler, _) = helpTuple;
@@ -881,7 +881,7 @@ ValueTask TextReply(string reply) => SendMessage(
 					return;
 				}
 
-				var tuple = GetCommand();
+				var tuple = GetCommand(command);
 
 				if (tuple == default)
 				{