From 382bb2c07834ac605d49cc67df0eaf1319f189c0 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:59:55 -0400
Subject: [PATCH] Disable IRC auto reconnection, use our own

- Customize some other timeouts

Fixes #1265
---
 .../Components/Chat/Providers/IrcProvider.cs       | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs
index c9ec3ea834..6f55f90c74 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs
@@ -23,11 +23,6 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 	/// </summary>
 	sealed class IrcProvider : Provider
 	{
-		/// <summary>
-		/// Number of seconds used for several IRC related timeouts.
-		/// </summary>
-		const int TimeoutSeconds = 5;
-
 		/// <inheritdoc />
 		public override bool Connected => client.IsConnected;
 
@@ -133,9 +128,8 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 				AutoRejoin = true,
 				AutoRejoinOnKick = true,
 				AutoRelogin = true,
-				AutoRetry = true,
-				AutoRetryLimit = TimeoutSeconds,
-				AutoRetryDelay = TimeoutSeconds,
+				AutoRetry = false,
+				AutoReconnect = false,
 				ActiveChannelSyncing = true,
 				AutoNickHandling = true,
 				CtcpVersion = assemblyInformationProvider.VersionString,
@@ -578,7 +572,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 			try
 			{
 				using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-				timeoutCts.CancelAfter(TimeSpan.FromSeconds(TimeoutSeconds));
+				timeoutCts.CancelAfter(TimeSpan.FromSeconds(25));
 				var timeoutToken = timeoutCts.Token;
 
 				var listenTimeSpan = TimeSpan.FromMilliseconds(10);
@@ -656,7 +650,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 				Task.WhenAll(
 					disconnectTask,
 					listenTask ?? Task.CompletedTask),
-				asyncDelayer.Delay(TimeSpan.FromSeconds(TimeoutSeconds), cancellationToken))
+				asyncDelayer.Delay(TimeSpan.FromSeconds(5), cancellationToken))
 				.ConfigureAwait(false);
 		}
 	}