unwrap polls properly, fix #2657

Author: DeinFreund

Shared/PlasmaShared/GlobalConst.cs

@@ -43,7 +43,7 @@ static void SetMode(ModeType newMode)
             switch (newMode) {
                 case ModeType.Local:
                     BaseSiteUrl = "http://localhost:9739";
-                    ZkDataContextConnectionString = @"Data Source=BRIEFTOP\SQLEXPRESS;Initial Catalog=zero-k_local;Integrated Security=True;MultipleActiveResultSets=true;Min Pool Size=5;Max Pool Size=2000";
+                    ZkDataContextConnectionString = @"Data Source=(LocalDb)\MSSQLLocalDB;Initial Catalog=zero-k_local;Integrated Security=True;MultipleActiveResultSets=true;Min Pool Size=5;Max Pool Size=2000";
 
                     LobbyServerHost = "localhost";
                     LobbyServerPort = 8200;

ZkLobbyServer/ServerBattle.cs

@@ -542,23 +542,26 @@ public async Task<bool> StartGame()
         public async Task<bool> StartVote(BattleCommand cmd, Say e, string args, int timeout = PollTimeout, CommandPoll poll = null)
         {
             cmd = cmd.Create();
-
-            if (cmd is CmdMap && string.IsNullOrEmpty(args)) return await CreateMultiMapPoll();
-
             string topic = cmd.Arm(this, e, args);
             if (topic == null) return false;
+
+            var unwrappedCmd = cmd;
+            if (cmd is CmdPoll) unwrappedCmd = (cmd as CmdPoll).InternalCommand;
+
+            if (unwrappedCmd is CmdMap && string.IsNullOrEmpty(args)) return await CreateMultiMapPoll();
+
             Func<string, string> selector = cmd.GetIneligibilityReasonFunc(this);
             if (e != null && selector(e.User) != null) return false;
             var options = new List<PollOption>();
 
             string url = null;
             string map = null;
-            if (cmd is CmdMap)
+            if (unwrappedCmd is CmdMap)
             {
-                url = $"{GlobalConst.BaseSiteUrl}/Maps/Detail/{(cmd as CmdMap).Map.ResourceID}";
-                map = (cmd as CmdMap).Map.InternalName;
+                url = $"{GlobalConst.BaseSiteUrl}/Maps/Detail/{(unwrappedCmd as CmdMap).Map.ResourceID}";
+                map = (unwrappedCmd as CmdMap).Map.InternalName;
             }
-            poll = poll ?? new CommandPoll(this, true, true, cmd is CmdMap, map, cmd is CmdStart);
+            poll = poll ?? new CommandPoll(this, true, true, unwrappedCmd is CmdMap, map, unwrappedCmd is CmdStart);
             options.Add(new PollOption()
             {
                 Name = "Yes",

ZkLobbyServer/autohost/Commands/CmdPoll.cs

@@ -13,6 +13,8 @@ public class CmdPoll : BattleCommand
 
         private BattleCommand commandToRun;
 
+        public BattleCommand InternalCommand { get { return commandToRun; } }
+        
         public override string Arm(ServerBattle battle, Say e, string arguments = null)
         {
             if (string.IsNullOrEmpty(arguments))