Merge pull request #1047 from tgstation/FixChatBotLeak [TGSDeploy]

v4.3.3

build/Version.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- This is the authorative version list -->
     <!-- Integration tests will ensure they match across the board -->
-    <TgsCoreVersion>4.3.2</TgsCoreVersion>
+    <TgsCoreVersion>4.3.3</TgsCoreVersion>
     <TgsApiVersion>6.6.0</TgsApiVersion>
     <TgsClientVersion>7.2.0</TgsClientVersion>
     <TgsDmapiVersion>5.2.2</TgsDmapiVersion>

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

@@ -177,7 +177,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		}
 
 		/// <inheritdoc />
-		public override async Task Disconnect(CancellationToken cancellationToken)
+		protected override async Task DisconnectImpl(CancellationToken cancellationToken)
 		{
 			Logger.LogTrace("Disconnecting...");
 			if (!Connected)

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

@@ -37,7 +37,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		Task<bool> Connect(CancellationToken cancellationToken);
 
 		/// <summary>
-		/// Gracefully disconnects the provider. Implies a call to <see cref="IDisposable.Dispose"/>
+		/// Gracefully disconnects the provider. Permanently stops the reconnection timer.
 		/// </summary>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
 		/// <returns>A <see cref="Task"/> representing the running operation</returns>

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

@@ -346,7 +346,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		}, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Current);
 
 		/// <inheritdoc />
-		public override async Task Disconnect(CancellationToken cancellationToken)
+		protected override async Task DisconnectImpl(CancellationToken cancellationToken)
 		{
 			if (!Connected)
 				return;

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

@@ -87,8 +87,19 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 		/// <inheritdoc />
 		public abstract Task<bool> Connect(CancellationToken cancellationToken);
 
+		/// <summary>
+		/// Gracefully disconnects the provider.
+		/// </summary>
+		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
+		/// <returns>A <see cref="Task"/> representing the running operation.</returns>
+		protected abstract Task DisconnectImpl(CancellationToken cancellationToken);
+
 		/// <inheritdoc />
-		public abstract Task Disconnect(CancellationToken cancellationToken);
+		public async Task Disconnect(CancellationToken cancellationToken)
+		{
+			await StopReconnectionTimer().ConfigureAwait(false);
+			await DisconnectImpl(cancellationToken).ConfigureAwait(false);
+		}
 
 		/// <inheritdoc />
 		public abstract Task<IReadOnlyCollection<ChannelRepresentation>> MapChannels(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken);

src/Tgstation.Server.Host/Controllers/ChatController.cs

@@ -197,7 +197,7 @@ namespace Tgstation.Server.Host.Controllers
 		{
 			var query = DatabaseContext.ChatBots
 				.AsQueryable()
-				.Where(x => x.Id == id)
+				.Where(x => x.Id == id && x.InstanceId == Instance.Id)
 				.Include(x => x.Channels);
 
 			var results = await query.FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);