Merge pull request #1740 from tgstation/Standardization

Allow emoji 🆑 tags
tgstation · Dec 4, 2023 · 6ecada5 · 6ecada5
2 parents 1c884d9 + c23c4fa
commit 6ecada5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,21 +2,21 @@
 
 [Release Notes]: # (Your PR should contain a detailed list of notable changes, titled appropriately. This includes any observable changes to the server or DMAPI. See examples below.)
 
-:cl:
+🆑
 Description of your change.
 Each newline corresponds to a release note in the release your change is included in.
-/:cl:
+/🆑
 
-:cl:
+🆑
 You can also have multiple sets of release notes per pull request.
 They will be amalgamated together in the end.
-/:cl:
+/🆑
 
-:cl: Categories
+🆑 Categories
 Categories are used by [the release notes tool](../tools/Tgstation.Server.ReleaseNotes) to generate formatted changelists used in releases.
 The default category is Core.
-Only one category may be specified for a :cl: block.
+Only one category may be specified for a 🆑 block.
 Valid categories are Core, DreamMaker API, HTTP API, Host Watchdog, Web Control Panel, Configuration, Nuget: Api, Nuget: Client, and Nuget: Common.
-/:cl:
+/🆑
 
 [Why]: # (If this does not close or work on an existing GitHub issue, please add a short description [two lines down] of why you think these changes would benefit the server. If you can't justify it in words, it might not be worth adding.)
diff --git a/src/Tgstation.Server.Host/Controllers/BridgeController.cs b/src/Tgstation.Server.Host/Controllers/BridgeController.cs
@@ -88,10 +88,10 @@ public async ValueTask<IActionResult> Process([FromQuery] string data, Cancellat
 
 			using (LogContext.PushProperty(SerilogContextHelper.BridgeRequestIterationContextProperty, Interlocked.Increment(ref requestsProcessed)))
 			{
-				BridgeParameters request;
+				var request = new BridgeParameters();
 				try
 				{
-					request = JsonConvert.DeserializeObject<BridgeParameters>(data, DMApiConstants.SerializerSettings);
+					JsonConvert.PopulateObject(data, request, DMApiConstants.SerializerSettings);
 				}
 				catch (Exception ex)
 				{

diff --git a/tools/Tgstation.Server.ReleaseNotes/Program.cs b/tools/Tgstation.Server.ReleaseNotes/Program.cs
@@ -682,15 +682,15 @@ async Task CommitNotes(Component component, List<string> notes)
 					var trimmedLine = line.Trim();
 					if (targetComponent == null)
 					{
-						if (trimmedLine.StartsWith(":cl:", StringComparison.Ordinal))
+						if (trimmedLine.StartsWith(":cl:", StringComparison.Ordinal) || trimmedLine.StartsWith("🆑", StringComparison.Ordinal))
 						{
 							targetComponent = trimmedLine[4..].Trim();
 							if (targetComponent.Length == 0)
 								targetComponent = "Core";
 						}
 						continue;
 					}
-					if (trimmedLine.StartsWith("/:cl:", StringComparison.Ordinal))
+					if (trimmedLine.StartsWith("/:cl:", StringComparison.Ordinal) || trimmedLine.StartsWith("/🆑", StringComparison.Ordinal))
 					{
 						if(!Enum.TryParse<Component>(targetComponent, out var component))
 							component = targetComponent.ToUpperInvariant() switch