From a9bd03e5b80b12c94da135da8f69b2327dcba427 Mon Sep 17 00:00:00 2001
From: Morb <14136326+Morb0@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:46:03 +0300
Subject: [PATCH] Update queue (#1477)

---
 Content.Server/Connection/ConnectionManager.cs         |  2 +-
 Content.Shared/Corvax/CCCVars/CCCVars.cs               | 10 ----------
 .../IServerJoinQueueManager.cs                         |  2 ++
 Resources/ConfigPresets/Corvax/athara.toml             |  1 +
 Resources/ConfigPresets/Corvax/echo.toml               |  1 +
 Resources/ConfigPresets/Corvax/elysium.toml            |  1 +
 Resources/ConfigPresets/Corvax/main.toml               |  1 +
 Resources/ConfigPresets/Corvax/nova.toml               |  1 +
 Resources/ConfigPresets/Corvax/solaris.toml            |  1 +
 .../Locale/ru-RU/corvax/join-queue/queue-screen.ftl    |  4 ++++
 Secrets                                                |  2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 2ed28c3a62..dd6cd5325e 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -145,7 +145,7 @@ namespace Content.Server.Connection
             }
 
             // Corvax-Queue-Start
-            var isQueueEnabled = _cfg.GetCVar(CCCVars.QueueEnabled);
+            var isQueueEnabled = IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out var mgr) && mgr.IsEnabled;
             if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled)
             // Corvax-Queue-End
             {
diff --git a/Content.Shared/Corvax/CCCVars/CCCVars.cs b/Content.Shared/Corvax/CCCVars/CCCVars.cs
index e09bb6f164..400e7844c2 100644
--- a/Content.Shared/Corvax/CCCVars/CCCVars.cs
+++ b/Content.Shared/Corvax/CCCVars/CCCVars.cs
@@ -9,16 +9,6 @@ namespace Content.Shared.Corvax.CCCVars;
 // ReSharper disable once InconsistentNaming
 public sealed class CCCVars
 {
-    /*
-     * Queue
-     */
-
-    /// <summary>
-    ///     Controls if the connections queue is enabled. If enabled stop kicking new players after `SoftMaxPlayers` cap and instead add them to queue.
-    /// </summary>
-    public static readonly CVarDef<bool>
-        QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
-
     /**
      * TTS (Text-To-Speech)
      */
diff --git a/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs b/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs
index 266faaa1b5..ef62ec55b5 100644
--- a/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs
+++ b/Corvax/Content.Corvax.Interfaces.Server/IServerJoinQueueManager.cs
@@ -2,7 +2,9 @@
 
 public interface IServerJoinQueueManager
 {
+    public bool IsEnabled { get; }
     public int PlayerInQueueCount { get; }
     public int ActualPlayersCount { get; }
     public void Initialize();
+    public void PostInitialize();
 }
diff --git a/Resources/ConfigPresets/Corvax/athara.toml b/Resources/ConfigPresets/Corvax/athara.toml
index 74ae5df1e0..68fecd83f4 100644
--- a/Resources/ConfigPresets/Corvax/athara.toml
+++ b/Resources/ConfigPresets/Corvax/athara.toml
@@ -11,6 +11,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/ConfigPresets/Corvax/echo.toml b/Resources/ConfigPresets/Corvax/echo.toml
index a95cc573b9..0a687f66bd 100644
--- a/Resources/ConfigPresets/Corvax/echo.toml
+++ b/Resources/ConfigPresets/Corvax/echo.toml
@@ -17,6 +17,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/ConfigPresets/Corvax/elysium.toml b/Resources/ConfigPresets/Corvax/elysium.toml
index 9ed4b43903..9be6699d71 100644
--- a/Resources/ConfigPresets/Corvax/elysium.toml
+++ b/Resources/ConfigPresets/Corvax/elysium.toml
@@ -11,6 +11,7 @@ time = 10.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/ConfigPresets/Corvax/main.toml b/Resources/ConfigPresets/Corvax/main.toml
index e42d3d114d..13950c2218 100644
--- a/Resources/ConfigPresets/Corvax/main.toml
+++ b/Resources/ConfigPresets/Corvax/main.toml
@@ -11,6 +11,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/ConfigPresets/Corvax/nova.toml b/Resources/ConfigPresets/Corvax/nova.toml
index c4d5a120cc..8b55e20a06 100644
--- a/Resources/ConfigPresets/Corvax/nova.toml
+++ b/Resources/ConfigPresets/Corvax/nova.toml
@@ -17,6 +17,7 @@ time = 10.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/ConfigPresets/Corvax/solaris.toml b/Resources/ConfigPresets/Corvax/solaris.toml
index 2486a26020..c57cb825f8 100644
--- a/Resources/ConfigPresets/Corvax/solaris.toml
+++ b/Resources/ConfigPresets/Corvax/solaris.toml
@@ -17,6 +17,7 @@ time = 180.0
 
 [queue]
 enabled = true
+alt_servers = true
 
 [tts]
 enabled = true
diff --git a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl
index ece8a6e941..99ba8a13da 100644
--- a/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl
+++ b/Resources/Locale/ru-RU/corvax/join-queue/queue-screen.ftl
@@ -3,3 +3,7 @@ queue-quit = Выйти
 queue-position = Ваша позиция:
 queue-total = Всего в очереди:
 queue-priority-join = Приоритетный вход
+queue-server-title = Вы можете подключиться к:
+queue-server-not-available = Нет доступных серверов
+queue-server-online = Онлайн:
+queue-server-connect = Подключиться
diff --git a/Secrets b/Secrets
index 3527f47c1e..9851c2c639 160000
--- a/Secrets
+++ b/Secrets
@@ -1 +1 @@
-Subproject commit 3527f47c1e71cc284ee43a17091120de7016c0c9
+Subproject commit 9851c2c63946c56d9feb4d6d5a92d8c34e23ed65