refactor: method for accept/refuse

Author: ThisAMJ

GhostServer/commands.cpp

@@ -340,20 +340,17 @@ void handle_cmd(NetworkManager *network, char *line) {
         std::string subcmd = argsL[1];
         if (subcmd == "players") {
             network->ScheduleServerThread([=]() {
-                network->acceptingPlayers = true;
+                network->SetAccept(true, true);
             });
-            LINE("Now accepting connections from players");
         } else if (subcmd == "spectators") {
             network->ScheduleServerThread([=]() {
-                network->acceptingSpectators = true;
+                network->SetAccept(false, true);
             });
-            LINE("Now accepting connections from spectators");
         } else if (subcmd == "all") {
             network->ScheduleServerThread([=]() {
-                network->acceptingPlayers = true;
-                network->acceptingSpectators = true;
+                network->SetAccept(true, true);
+                network->SetAccept(false, true);
             });
-            LINE("Now accepting connections from players and spectators");
         } else {
             LINE("Usage: accept <players|spectators|all>");
         }
@@ -368,20 +365,17 @@ void handle_cmd(NetworkManager *network, char *line) {
         std::string subcmd = argsL[1];
         if (subcmd == "players") {
             network->ScheduleServerThread([=]() {
-                network->acceptingPlayers = false;
+                network->SetAccept(true, false);
             });
-            LINE("Now refusing connections from players");
         } else if (subcmd == "spectators") {
             network->ScheduleServerThread([=]() {
-                network->acceptingSpectators = false;
+                network->SetAccept(false, false);
             });
-            LINE("Now refusing connections from spectators");
         } else if (subcmd == "all") {
             network->ScheduleServerThread([=]() {
-                network->acceptingPlayers = false;
-                network->acceptingSpectators = false;
+                network->SetAccept(true, false);
+                network->SetAccept(false, false);
             });
-            LINE("Now refusing connections from players and spectators");
         } else {
             LINE("Usage: refuse <players|spectators|all>");
         }

GhostServer/networkmanager.cpp

@@ -243,11 +243,25 @@ void NetworkManager::StartCountdown(const std::string preCommands, const std::st
         client.tcpSocket->send(packet);
     }
     if (true) { // TODO: Make this a setting?
-        this->acceptingPlayers = false;
-        GHOST_LOG("Now refusing connections from players");
+        this->SetAccept(true, false);
     }
 }
 
+void NetworkManager::SetAccept(bool players, bool allow)
+{
+    bool changed = false;
+    if (players) {
+        changed = this->acceptingPlayers != allow;
+        this->acceptingPlayers = allow;
+    } else {
+        changed = this->acceptingSpectators != allow;
+        this->acceptingSpectators = allow;
+    }
+    if (!changed) return;
+    GHOST_LOG(std::string("Now ") + (allow ? "accepting" : "refusing") + " connections from " + (players ? "players" : "spectators"));
+
+}
+
 bool NetworkManager::ShouldBlockConnection(const sf::IpAddress& ip)
 {
     if (std::find_if(this->clients.begin(), this->clients.end(), [&ip](const Client& c) { return ip == c.IP; }) != this->clients.end()) {

GhostServer/networkmanager.h

@@ -133,6 +133,7 @@ class NetworkManager
     bool ShouldBlockConnection(const sf::IpAddress &ip);
     void DisconnectPlayer(Client &client, const char *reason);
     void StartCountdown(const std::string preCommands, const std::string postCommands, const int duration);
+    void SetAccept(bool players, bool accept);
 
     void CheckConnection();
     void ReceiveUDPUpdates(std::vector<std::tuple<sf::Packet, sf::IpAddress, unsigned short>>& buffer);