Ticket #4528: late_observer_buddies_v0.8.patch

binaries/data/config/default.cfg

@@ -377 +377 @@
 [mod]
 enabledmods = "mod public"
 
 [network]
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
-lateobserverjoins = true          ; Allow observers to join the game after it started
+lateobserverjoins = 2             ; Allow observers to join the game after it started
 observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
 
 [overlay]
 fps = "false"                     ; Show frames per second in top right corner
 realtime = "false"                ; Show current system time in top right corner

binaries/data/mods/public/gui/options/options.json

@@ -78 +78 @@
             "label": "Persist Match Settings",
             "tooltip": "Save and restore match settings for quick reuse when hosting another game",
             "parameters": { "config": "persistmatchsettings" }
         },
         {
-            "type": "boolean",
+            "type": "dropdown",
             "label": "Late Observer Joins",
-            "tooltip": "Allow observers to join the game after it started",
-            "parameters": { "config": "network.lateobserverjoins" }
+            "tooltip": "Allow everybody or buddies only to join the game as observer after it started",
+            "parameters": { "list": [ "Enabled", "Only Buddies", "Disabled" ], "config": "network.lateobserverjoins" }
         },
         {
             "type": "number",
             "label": "Observer Limit",
             "tooltip": "Prevent further observers from joining if the limit is reached",

source/network/NetServer.cpp

@@ -23 +23 @@
 #include "NetMessage.h"
 #include "NetSession.h"
 #include "NetServerTurnManager.h"
 #include "NetStats.h"
 
+// TODO: find right place
+#include <regex>
+
 #include "lib/external_libraries/enet.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
@@ -928 +931 @@
     {
         session->Disconnect(NDR_BANNED);
         return true;
     }
 
-    // Optionally allow observers to join after the game has started
-    bool observerLateJoin = false;
-    CFG_GET_VAL("network.lateobserverjoins", observerLateJoin);
-
-    int maxObservers = 0;
-    CFG_GET_VAL("network.observerlimit", maxObservers);
-
     bool isRejoining = false;
     bool serverFull = false;
     if (server.m_State == SERVER_STATE_PREGAME)
     {
         // Don't check for maxObservers in the gamesetup, as we don't know yet who will be assigned
         serverFull = server.m_Sessions.size() >= MAX_CLIENTS;
     }
     else
     {
-        isRejoining = observerLateJoin;
         bool isObserver = true;
         int disconnectedPlayers = 0;
         int connectedPlayers = 0;
         // (TODO: if GUIDs were stable, we should use them instead)
         for (const std::pair<CStr, PlayerAssignment>& p : server.m_PlayerAssignments)
@@ -968 +963 @@
                 ++connectedPlayers;
             else
                 ++disconnectedPlayers;
         }
 
-        // Players who weren't already in the game are not allowed to join now that it's started
+        // Optionally allow everyone or only buddies to join after the game has started
+        if (!isRejoining)
+        {
+            int observerLateJoin = 0;
+            CFG_GET_VAL("network.lateobserverjoins", observerLateJoin);
+
+            if (observerLateJoin == 2)
+            {
+                isRejoining = true;
+            }
+            else if (observerLateJoin == 1)
+            {
+                CStr usernameWithoutRating;
+                std::regex usernameRegEx("S+ ([0-9]+)");
+                std::cmatch usernameMatch;
+                if (std::regex_search(utf8_from_wstring(username).c_str(), usernameMatch, usernameRegEx))
+                    usernameWithoutRating = usernameMatch[0].str();
+                debug_printf("witout rating %s\n", usernameWithoutRating.c_str());
+/*
+                std::string buddies;
+                CFG_GET_VAL("lobby.buddies", buddies);
+                std::regex buddyRegEx("");
+                std::cmatch buddyMatch;
+                if (std::regex_search(usernameWithoutRating, buddyMatch, buddyRegEx))
+                    isRejoining = true;
+*/          }
+        }
+
         if (!isRejoining)
         {
             LOGMESSAGE("Refused connection after game start from not-previously-known user \"%s\"", utf8_from_wstring(username));
             session->Disconnect(NDR_SERVER_ALREADY_IN_GAME);
             return true;
         }
 
+        int maxObservers = 0;
+        CFG_GET_VAL("network.observerlimit", maxObservers);
+
         // Ensure all players will be able to rejoin
         serverFull = isObserver && (
             (int) server.m_Sessions.size() - connectedPlayers > maxObservers ||
             (int) server.m_Sessions.size() + disconnectedPlayers >= MAX_CLIENTS);
     }