From f8a97f84af79d402fb67edfcb5b82edc0280928e Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Wed, 10 Feb 2021 17:53:05 -0500
Subject: [PATCH] Warnings cleaned up

---
 .../Models/Request/UserCreateRequest.cs       |  1 +
 .../Chat/Providers/DiscordProvider.cs         | 37 ++++++++++++++-----
 .../Core/SwaggerConfiguration.cs              |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/Tgstation.Server.Api/Models/Request/UserCreateRequest.cs b/src/Tgstation.Server.Api/Models/Request/UserCreateRequest.cs
index 715a056386..74f37ef7d2 100644
--- a/src/Tgstation.Server.Api/Models/Request/UserCreateRequest.cs
+++ b/src/Tgstation.Server.Api/Models/Request/UserCreateRequest.cs
@@ -3,6 +3,7 @@ namespace Tgstation.Server.Api.Models
 	/// <summary>
 	/// For creating a user.
 	/// </summary>
+	#pragma warning disable CA1501
 	public sealed class UserCreateRequest : UserUpdateRequest
 	{
 	}
diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
index a1dcb0b409..1817808d27 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
@@ -371,21 +371,23 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 			}
 		}
 
-		/// <inheritdoc />
-		public override async Task<Func<string, string, Task>> SendUpdateMessage(
+		/// <summary>
+		/// Create a <see cref="List{T}"/> of <see cref="EmbedFieldBuilder"/>s for a discord update embed.
+		/// </summary>
+		/// <param name="revisionInformation">The <see cref="RevisionInformation"/> of the deployment.</param>
+		/// <param name="byondVersion">The BYOND <see cref="Version"/> of the deployment.</param>
+		/// <param name="gitHubOwner">The repository GitHub owner, if any.</param>
+		/// <param name="gitHubRepo">The repository GitHub name, if any.</param>
+		/// <param name="localCommitPushed"><see langword="true"/> if the local deployment commit was pushed to the remote repository.</param>
+		/// <returns>A new <see cref="List{T}"/> of <see cref="EmbedFieldBuilder"/>s to use.</returns>
+		static List<EmbedFieldBuilder> BuildUpdateEmbedFields(
 			Models.RevisionInformation revisionInformation,
 			Version byondVersion,
-			DateTimeOffset? estimatedCompletionTime,
 			string gitHubOwner,
 			string gitHubRepo,
-			ulong channelId,
-			bool localCommitPushed,
-			CancellationToken cancellationToken)
+			bool localCommitPushed)
 		{
 			bool gitHub = gitHubOwner != null && gitHubRepo != null;
-
-			localCommitPushed |= revisionInformation.CommitSha == revisionInformation.OriginCommitSha;
-
 			var fields = new List<EmbedFieldBuilder>
 			{
 				new EmbedFieldBuilder
@@ -420,6 +422,23 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 					Value = $"[{x.TitleAtMerge}]({x.Url}) by _[@{x.Author}](https://github.com/{x.Author})_{Environment.NewLine}Commit: [{x.TargetCommitSha.Substring(0, 7)}](https://github.com/{gitHubOwner}/{gitHubRepo}/commit/{x.TargetCommitSha}){(String.IsNullOrWhiteSpace(x.Comment) ? String.Empty : $"{Environment.NewLine}_**{x.Comment}**_")}"
 				}));
 
+			return fields;
+		}
+
+		/// <inheritdoc />
+		public override async Task<Func<string, string, Task>> SendUpdateMessage(
+			Models.RevisionInformation revisionInformation,
+			Version byondVersion,
+			DateTimeOffset? estimatedCompletionTime,
+			string gitHubOwner,
+			string gitHubRepo,
+			ulong channelId,
+			bool localCommitPushed,
+			CancellationToken cancellationToken)
+		{
+			localCommitPushed |= revisionInformation.CommitSha == revisionInformation.OriginCommitSha;
+
+			var fields = BuildUpdateEmbedFields(revisionInformation, byondVersion, gitHubOwner, gitHubRepo, localCommitPushed);
 			var builder = new EmbedBuilder
 			{
 				Author = new EmbedAuthorBuilder
diff --git a/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs b/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
index 2f2c9518cc..888be2a716 100644
--- a/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
+++ b/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
@@ -422,7 +422,7 @@ namespace Tgstation.Server.Host.Core
 			var rootSchemaId = GenerateSchemaId(context.Type);
 			var rootRequestSchema = rootSchemaId.EndsWith("Request", StringComparison.Ordinal);
 			var rootResponseSchema = rootSchemaId.EndsWith("Response", StringComparison.Ordinal);
-			var isPutRequest = rootRequestSchema && rootSchemaId.EndsWith("CreateRequest", StringComparison.Ordinal);
+			var isPutRequest = rootSchemaId.EndsWith("CreateRequest", StringComparison.Ordinal);
 
 			Tuple<PropertyInfo, string, OpenApiSchema, IDictionary<string, OpenApiSchema>> GetTypeFromKvp(Type currentType, KeyValuePair<string, OpenApiSchema> kvp, IDictionary<string, OpenApiSchema> schemaDictionary)
 			{