diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index b485661d3f..6b58f2c0a6 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -962,7 +962,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers embedErrors.Add( String.Format( CultureInfo.InvariantCulture, - "Null or whitespace field author at index {0}!", + "Null or whitespace field name at index {0}!", i)); invalid = true; } @@ -972,7 +972,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers embedErrors.Add( String.Format( CultureInfo.InvariantCulture, - "Null or whitespace field author at index {0}!", + "Null or whitespace field value at index {0}!", i)); invalid = true; } diff --git a/src/Tgstation.Server.Host/IO/DefaultIOManager.cs b/src/Tgstation.Server.Host/IO/DefaultIOManager.cs index 508f0ace4a..e6e6c1ca0f 100644 --- a/src/Tgstation.Server.Host/IO/DefaultIOManager.cs +++ b/src/Tgstation.Server.Host/IO/DefaultIOManager.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Tgstation.Server.Host.Extensions; using Tgstation.Server.Host.Utils; namespace Tgstation.Server.Host.IO @@ -388,7 +389,7 @@ namespace Tgstation.Server.Host.IO async Task CopyThisFile() { - await subdirCreationTask; + await subdirCreationTask.WithToken(cancellationToken); using var lockContext = semaphore != null ? await SemaphoreSlimContext.Lock(semaphore, cancellationToken) : null; diff --git a/src/Tgstation.Server.Host/manifest.xml b/src/Tgstation.Server.Host/manifest.xml index 6374470a86..5173bf8331 100644 --- a/src/Tgstation.Server.Host/manifest.xml +++ b/src/Tgstation.Server.Host/manifest.xml @@ -1,7 +1,6 @@ -