Merge pull request #67 from Erol444/fix_navigation

Fix navigation

Author: Erol444

TbsCore/Helpers/HttpHelper.cs

@@ -1,6 +1,7 @@
 using RestSharp;
 using System;
 using System.Net;
+using System.Threading.Tasks;
 using TbsCore.Models.Access;
 using TbsCore.Models.AccModels;
 
@@ -24,10 +25,20 @@ public static CookieContainer GetCookies(Account acc)
             return cookieContainer;
         }
 
+        public static async Task<string> SendPostReqAsync(Account acc, RestRequest req)
+        {
+            acc.Wb.RestClient.BaseUrl = new Uri(acc.AccInfo.ServerUrl);
+            acc.Wb.RestClient.CookieContainer = GetCookies(acc);
+
+            var response = await acc.Wb.RestClient.ExecuteAsync(req);
+            if (response.StatusCode != HttpStatusCode.OK) throw new Exception("SendGetReq failed!\n" + response.Content);
+
+            return response.Content;
+        }
         public static string SendPostReq(Account acc, RestRequest req)
         {
             acc.Wb.RestClient.BaseUrl = new Uri(acc.AccInfo.ServerUrl);
-            acc.Wb.RestClient.CookieContainer = HttpHelper.GetCookies(acc);
+            acc.Wb.RestClient.CookieContainer = GetCookies(acc);
 
             var response = acc.Wb.RestClient.Execute(req);
             if (response.StatusCode != HttpStatusCode.OK) throw new Exception("SendGetReq failed!\n" + response.Content);

TbsCore/Helpers/NavigationHelper.cs

@@ -20,6 +20,7 @@ public static async Task<bool> MainNavigate(Account acc, MainNavigationButton bu
             var nav = acc.Wb.Html.GetElementbyId("navigation");
             if (nav == null) return false;
             await DriverHelper.ClickByAttributeValue(acc, "accesskey", ((int)button).ToString());
+            await TaskExecutor.PageLoaded(acc);
             return true;
         }
 

TbsCore/Helpers/VillageHelper.cs

@@ -87,20 +87,21 @@ public static Village VillageFromId(Account acc, int id)
 
         public static async Task SwitchVillage(Account acc, int id)
         {
-            // Parse village list again and find correct href
             Uri uri = new Uri(acc.Wb.CurrentUrl);
 
+            // Parse village list again and find correct href
             var vills = RightBarParser.GetVillages(acc.Wb.Html, acc.AccInfo.ServerVersion);
             var href = vills.FirstOrDefault(x => x.Id == id)?.Href;
-
             if (string.IsNullOrEmpty(href)) // Login screen, server messages etc.
             {
-                await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf1.php?newdid={id}");
+                await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf1.php");
                 return;
             }
 
-            if (href.Contains(acc.AccInfo.ServerUrl)) await acc.Wb.Navigate(href);
-            else await acc.Wb.Navigate(uri.Scheme + "://" + uri.Host + uri.AbsolutePath + href);
+            var val = $"?newdid={id}";
+            // The * after href is for query selector; it will select all elements that contain {val}
+            await DriverHelper.ClickByAttributeValue(acc, "href*", val);
+            await TaskExecutor.PageLoaded(acc);
         }
 
         /// <summary>

TbsCore/Tasks/LowLevel/SendWaves.cs

@@ -202,7 +202,7 @@ public override async Task<TaskRes> Execute(Account acc)
             {
                 lastSent = DateTime.Now;
                 acc.Logger.Information($"{DateTime.Now.Second}.{DateTime.Now.Millisecond}] Sending wave {i + 1}");
-                _ = HttpHelper.SendPostReq(acc, wavesReady[i].Request);
+                _ = HttpHelper.SendPostReqAsync(acc, wavesReady[i].Request);
 
                 // Wait +- 10% selected delay
                 var delay = SendWaveModels[i].DelayMs;

TbsCore/Tasks/LowLevel/UpdateVillage.cs

@@ -30,7 +30,7 @@ public override async Task<TaskRes> Execute(Account acc)
 
             await UpdateTroopsResearchedAndLevels(acc);
 
-            await acc.Wb.Navigate($"{acc.AccInfo.ServerUrl}/dorf2.php");
+            await NavigationHelper.ToDorf2(acc);
             await Task.Delay(AccountHelper.Delay(acc));
             await UpdateTroopsTraining(acc);
 

TbsCore/Tasks/SecondLevel/ScoutPlayer.cs

@@ -15,7 +15,7 @@ namespace TbsCore.Tasks.SecondLevel
     public class ScoutPlayer : CheckProfile
     {
         public int MinPop { get; set; } = 100;
-        public int MaxPop { get; set; } = 300;
+        public int MaxPop { get; set; } = 1000;
         public int ScoutNum { get; set; } = 1;
 
         public override async Task<TaskRes> Execute(Account acc)