Merge branch 'master' into dev

src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs

@@ -266,8 +266,10 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 					})
 					.ConfigureAwait(false);
 			}
-			catch (Exception e) when (!(e is OperationCanceledException))
+			catch (Exception e)
 			{
+				if (e is OperationCanceledException)
+					cancellationToken.ThrowIfCancellationRequested();
 				Logger.LogWarning(e, "Error sending discord message!");
 			}
 		}

src/Tgstation.Server.Host/Components/Session/SessionController.cs

@@ -370,7 +370,8 @@ namespace Tgstation.Server.Host.Components.Session
 						await chat.SendMessage(
 							parameters.ChatMessage.Text,
 							parameters.ChatMessage.ChannelIds.Select(UInt64.Parse),
-							cancellationToken).ConfigureAwait(false);
+							cancellationToken)
+							.ConfigureAwait(false);
 						break;
 					case BridgeCommandType.Prime:
 						var oldPrimeTcs = primeTcs;

tests/DMAPI/BasicOperation/Test.dm

@@ -1,5 +1,6 @@
 /world/New()
 	log << "About to call TgsNew()"
+	sleep_offline = FALSE
 	TgsNew(minimum_required_security_level = TGS_SECURITY_SAFE)
 	log << "About to call StartAsync()"
 	StartAsync()