Merge pull request #54 from Erol444/develop

Erol444 · web-flow · commit 92b40219cb29 · 2021-10-24T16:41:38.000+02:00
Develop
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -36,7 +36,7 @@ jobs:
         id: Changelog
         run: |
           git branch --show-current
-          changelog=$(git log --no-merges --pretty=format:'- %s' ${{ steps.previoustag.outputs.tag }}..HEAD)
+          changelog=$(git log --no-merges --pretty=format:'- %s' ${{ steps.previoustag.outputs.tag }}..HEAD --reverse)
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           git branch --show-current
           last=$(git log --merges --grep='develop' --first-parent master --pretty=format:"%h" | sed -n '2p')
-          changelog=$(git log --no-merges --pretty=format:'- %s' $last..HEAD)
+          changelog=$(git log --no-merges --pretty=format:'- %s' $last..HEAD --reverse)
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"
@@ -130,7 +130,7 @@ jobs:
           nodetail: retrue
           description: |
               Version `TBS-${{needs.version.outputs.version}}`
-              Click [here](https://github.com/Erol444/TravianBotSharp/releases/tag/${{steps.tag.outputs.tag}}) to download!
+              Click [here](https://github.com/Erol444/TravianBotSharp/releases/tag/${{needs.version.outputs.version}}) to download!
               **Changelog**:
               ${{needs.version.outputs.changelog}}
   Clear:
diff --git a/TbsCore/Core/WebBrowserInfo.cs b/TbsCore/Core/WebBrowserInfo.cs
@@ -91,7 +91,7 @@ private void SetupChromeDriver(Access.Access access, string username, string ser
                 options.AddArgument("ignore-certificate-errors"); // --ignore-certificate-errors ?
             }
 
-            options.AddArgument($"--user-agent={access.UserAgent}");
+            //options.AddArgument($"--user-agent={access.UserAgent}");
 
             //options.AddArguments("--disable-logging");
             //options.AddArguments("--disable-metrics");
diff --git a/TbsCore/Helpers/AccountHelper.cs b/TbsCore/Helpers/AccountHelper.cs
@@ -53,7 +53,7 @@ public static int Delay(Account acc)
         {
             //Return random delay
             Random rnd = new Random();
-            return acc.Settings.DelayClicking + rnd.Next(-500, 500);
+            return rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);
         }
 
         public static void StartAccountTasks(Account acc)
diff --git a/TbsCore/Helpers/HttpHelper.cs b/TbsCore/Helpers/HttpHelper.cs
@@ -1,12 +1,8 @@
-﻿using Newtonsoft.Json;
-using RestSharp;
+﻿using RestSharp;
 using System;
 using System.Net;
-using TbsCore.Helpers;
 using TbsCore.Models.Access;
 using TbsCore.Models.AccModels;
-using TbsCore.Models.MapModels;
-using TbsCore.Models.VillageModels;
 
 namespace TbsCore.Helpers
 {
@@ -62,7 +58,7 @@ public static HtmlAgilityPack.HtmlDocument SendGetReq(Account acc, string url)
         public static void InitRestClient(Access access, RestClient client)
         {
             client.Timeout = 5000;
-            client.UserAgent = access.UserAgent;
+            //client.UserAgent = access.UserAgent;
 
             // Set proxy
             if (!string.IsNullOrEmpty(access.Proxy))
diff --git a/TbsCore/Helpers/UpdateAccountObject.cs b/TbsCore/Helpers/UpdateAccountObject.cs
@@ -14,7 +14,7 @@ public static class UpdateAccountObject
     {
         public static bool UpdateVillages(HtmlAgilityPack.HtmlDocument htmlDoc, Account acc)
         {
-            List<VillageChecked> foundVills = RightBarParser.GetVillages(htmlDoc);
+            List<VillageChecked> foundVills = RightBarParser.GetVillages(htmlDoc, acc.AccInfo.ServerVersion);
             if (foundVills.Count == 0) return false; //some problem in GetVillages function!
 
             for (int i = 0; i < acc.Villages.Count; i++)
diff --git a/TbsCore/Helpers/VillageHelper.cs b/TbsCore/Helpers/VillageHelper.cs
@@ -86,7 +86,7 @@ public static async Task SwitchVillage(Account acc, int id)
             // Parse village list again and find correct href
             Uri uri = new Uri(acc.Wb.CurrentUrl);
 
-            var vills = RightBarParser.GetVillages(acc.Wb.Html);
+            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.
diff --git a/TbsCore/Models/Settings/GeneralSettings.cs b/TbsCore/Models/Settings/GeneralSettings.cs
@@ -26,7 +26,8 @@ public void Init()
             DonateAbove = 95;
             DonateExcessOf = 65;
             DiscordWebhook = false;
-            DelayClicking = 3000;
+            DelayClickingMin = 2500;
+            DelayClickingMax = 3800;
         }
 
         public bool AutoActivateProductionBoost { get; set; }
@@ -134,9 +135,14 @@ public void Init()
         public bool DiscordOnlineAnnouncement { get; set; }
 
         /// <summary>
-        /// How long should bot click between 2 click ( bot will +- 500ms for random )
+        /// Minimum time between 2 click
         /// </summary>
-        public int DelayClicking { get; set; }
+        public int DelayClickingMin { get; set; }
+
+        /// <summary>
+        /// Maximum time between 2 click
+        /// </summary>
+        public int DelayClickingMax { get; set; }
     }
 
     /// <summary>
diff --git a/TbsCore/Parsers/RightBarParser.cs b/TbsCore/Parsers/RightBarParser.cs
@@ -4,6 +4,7 @@
 using TbsCore.Models.MapModels;
 using TbsCore.Models.SideBarModels;
 using TbsCore.Helpers;
+using static TbsCore.Helpers.Classificator;
 
 namespace TbsCore.Parsers
 {
@@ -37,48 +38,71 @@ public static CulturePoints GetCulturePoints(HtmlAgilityPack.HtmlDocument htmlDo
             };
         }
 
-        public static List<VillageChecked> GetVillages(HtmlAgilityPack.HtmlDocument htmlDoc)
+        public static List<VillageChecked> GetVillages(HtmlAgilityPack.HtmlDocument htmlDoc, ServerVersionEnum serverVersion)
         {
             List<VillageChecked> ret = new List<VillageChecked>();
 
-            try
+            var villsNode = htmlDoc.GetElementbyId("sidebarBoxVillagelist");
+            if (villsNode == null) return ret;
+            List<HtmlAgilityPack.HtmlNode> vills = null;
+            switch (serverVersion)
             {
-                var villsNode = htmlDoc.GetElementbyId("sidebarBoxVillagelist");
-                if (villsNode == null) return ret;
-
-                var vills = villsNode.Descendants("li").ToList();
-                foreach (var node in vills)
-                {
-                    bool underAttack = false, active = false;
+                case ServerVersionEnum.T4_4:
+                    {
+                        vills = villsNode.Descendants("li").ToList();
+                        break;
+                    }
+                case ServerVersionEnum.T4_5:
+                    {
+                        vills = villsNode.Descendants("div").Where(x => x.HasClass("listEntry")).ToList();
+                        break;
+                    }
+            }
 
-                    if (node.HasClass("attack"))
-                        underAttack = true;
-                    if (node.HasClass("active"))
-                        active = true;
+            if (vills == null) return ret;
 
-                    var href = System.Net.WebUtility.HtmlDecode(node.ChildNodes.First(x => x.Name == "a").GetAttributeValue("href", ""));
+            foreach (var node in vills)
+            {
+                bool underAttack = false, active = false;
 
-                    var villId = Convert.ToInt32(href.Split('=')[1].Split('&')[0]);
+                if (node.HasClass("attack"))
+                    underAttack = true;
+                if (node.HasClass("active"))
+                    active = true;
 
-                    var villName = node.Descendants().FirstOrDefault(x => x.HasClass("name")).InnerText;
-                    var coords = new Coordinates()
-                    {
-                        x = (int)Parser.ParseNum(node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateX")).InnerText.Replace("(", "")),
-                        y = (int)Parser.ParseNum(node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateY")).InnerText.Replace(")", ""))
-                    };
+                var href = System.Net.WebUtility.HtmlDecode(node.ChildNodes.FirstOrDefault(x => x.Name == "a").GetAttributeValue("href", ""));
+                var villId = Convert.ToInt32(href.Split('=')[1].Split('&')[0]);
+                var villName = node.Descendants("a").FirstOrDefault().InnerText.Replace(" ", "").Replace("\r\n", "");
 
-                    ret.Add(new VillageChecked()
-                    {
-                        Id = villId,
-                        UnderAttack = underAttack,
-                        Name = villName,
-                        Coordinates = coords,
-                        Active = active,
-                        Href = href,
-                    });
+                var x_node = node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateX"));
+                int x_coord = 0;
+                if (x_node != null)
+                {
+                    x_coord = (int)Parser.ParseNum(x_node.InnerText.Replace("(", ""));
+                }
+                var y_node = node.Descendants("span").FirstOrDefault(x => x.HasClass("coordinateY"));
+                int y_coord = 0;
+                if (y_node != null)
+                {
+                    y_coord = (int)Parser.ParseNum(y_node.InnerText.Replace(")", ""));
                 }
+                var coords = new Coordinates()
+                {
+                    x = x_coord,
+                    y = y_coord,
+                };
+
+                ret.Add(new VillageChecked()
+                {
+                    Id = villId,
+                    UnderAttack = underAttack,
+                    Name = villName,
+                    Coordinates = coords,
+                    Active = active,
+                    Href = href,
+                });
             }
-            catch (Exception e) { Console.WriteLine("error " + e.Message); }
+
             return ret;
         }
 
diff --git a/TbsCore/TbsCore.csproj b/TbsCore/TbsCore.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="RandomUserAgent" Version="1.1.2" />
     <PackageReference Include="RestSharp" Version="106.12.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="91.0.4472.10100" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="95.0.4638.1700" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
diff --git a/TbsCore/packages.lock.json b/TbsCore/packages.lock.json
@@ -72,9 +72,9 @@
       },
       "Selenium.WebDriver.ChromeDriver": {
         "type": "Direct",
-        "requested": "[91.0.4472.10100, )",
-        "resolved": "91.0.4472.10100",
-        "contentHash": "RalhItuJ6BZdD9HHVUHdpgDP/NQAUrr1yEAHWet+Ww33wbcuei0A2sF4+9duKaLQuZO3lcid7pKe2+km3sOGBQ=="
+        "requested": "[95.0.4638.1700, )",
+        "resolved": "95.0.4638.1700",
+        "contentHash": "RuziiapHW2Yhw77AuvWmACzPOjjw7QdoSh9rhXxB+brO5ihsJE4V3xVY7tYX1VxKJOjRjB6ITAzmavlA1StkGw=="
       },
       "Serilog": {
         "type": "Direct",
diff --git a/TravBotSharp/ControlPanel.Designer.cs b/TravBotSharp/ControlPanel.Designer.cs
diff --git a/TravBotSharp/ControlPanel.cs b/TravBotSharp/ControlPanel.cs
@@ -258,7 +258,7 @@ private void button6_Click(object sender, EventArgs e) // Login all accounts
                     if (acc.TaskTimer?.IsBotRunning() ?? false) continue;
 
                     _ = IoHelperCore.LoginAccount(acc);
-                    await Task.Delay(ran.Next(500, 5000));
+                    await Task.Delay(AccountHelper.Delay(acc));
                 }
             }).Start();
             generalUc1.UpdateBotRunning("true");
diff --git a/TravBotSharp/TbsWinForms.csproj b/TravBotSharp/TbsWinForms.csproj
@@ -734,13 +734,13 @@
     <Error Condition="!Exists('..\packages\Costura.Fody.5.0.2\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.5.0.2\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
     <CallTarget Targets="AssemblyInfo" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.91.0.4472.10100\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.91.0.4472.10100\build\Selenium.WebDriver.ChromeDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.95.0.4638.1700\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.95.0.4638.1700\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
   <Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
   <Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
   <Target Name="AssemblyInfo">
     <AssemblyInfo CodeLanguage="CS" OutputFile="Properties\AssemblyInfo.cs" AssemblyVersion="$(BUILD_NUMBER)" AssemblyFileVersion="$(BUILD_NUMBER)" />
   </Target>
-  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.91.0.4472.10100\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.91.0.4472.10100\build\Selenium.WebDriver.ChromeDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.95.0.4638.1700\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.95.0.4638.1700\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
diff --git a/TravBotSharp/Views/DebugUc.cs b/TravBotSharp/Views/DebugUc.cs
@@ -11,10 +11,12 @@ namespace TravBotSharp.Views
     public partial class DebugUc : TbsBaseUc, ITbsUc
     {
         public LogOutput Log;
+        public bool active;
 
         public DebugUc()
         {
             InitializeComponent();
+            active = false;
         }
 
         public void InitLog(LogOutput log)
@@ -25,13 +27,20 @@ public void InitLog(LogOutput log)
 
         public void UpdateUc()
         {
+            active = true;
             UpdateTaskTable();
             GetLogData();
             this.Focus();
         }
 
+        public void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            active = false;
+        }
+
         private void LogUpdate(object sender, UpdateLogEventArgs e)
         {
+            if (!active) return;
             // only update current account
             if (e.Username == GetSelectedAcc().AccInfo.Nickname)
             {
@@ -41,6 +50,8 @@ private void LogUpdate(object sender, UpdateLogEventArgs e)
 
         public void GetLogData()
         {
+            if (!active) return;
+
             if (logTextBox.InvokeRequired)
             {
                 logTextBox.BeginInvoke(new Action(delegate
@@ -56,6 +67,7 @@ public void GetLogData()
 
         public void UpdateLogData()
         {
+            if (!active) return;
             if (logTextBox.InvokeRequired)
             {
                 logTextBox.BeginInvoke(new Action(delegate
@@ -65,11 +77,12 @@ public void UpdateLogData()
                 return;
             }
             var acc = GetSelectedAcc();
-            logTextBox.Text = $"{Log.GetLog(acc.AccInfo.Nickname)}{logTextBox.Text}";
+            logTextBox.Text = $"{Log.GetLastLog(acc.AccInfo.Nickname)}{logTextBox.Text}";
         }
 
         public void UpdateTaskTable()
         {
+            if (!active) return;
             if (taskListView.InvokeRequired)
             {
                 taskListView.BeginInvoke(new Action(delegate
diff --git a/TravBotSharp/Views/GeneralUc.Designer.cs b/TravBotSharp/Views/GeneralUc.Designer.cs
diff --git a/TravBotSharp/Views/GeneralUc.cs b/TravBotSharp/Views/GeneralUc.cs
diff --git a/TravBotSharp/packages.config b/TravBotSharp/packages.config

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private void SetupChromeDriver(Access.Access access, string username, string ser`
`91`	`91`	`options.AddArgument("ignore-certificate-errors"); // --ignore-certificate-errors ?`
`92`	`92`	`}`
`93`	`93`
`94`		`- options.AddArgument($"--user-agent={access.UserAgent}");`
	`94`	`+ //options.AddArgument($"--user-agent={access.UserAgent}");`
`95`	`95`
`96`	`96`	`//options.AddArguments("--disable-logging");`
`97`	`97`	`//options.AddArguments("--disable-metrics");`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static int Delay(Account acc)`
`53`	`53`	`{`
`54`	`54`	`//Return random delay`
`55`	`55`	`Random rnd = new Random();`
`56`		`- return acc.Settings.DelayClicking + rnd.Next(-500, 500);`
	`56`	`+ return rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public static void StartAccountTasks(Account acc)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static class UpdateAccountObject`
`14`	`14`	`{`
`15`	`15`	`public static bool UpdateVillages(HtmlAgilityPack.HtmlDocument htmlDoc, Account acc)`
`16`	`16`	`{`
`17`		`- List<VillageChecked> foundVills = RightBarParser.GetVillages(htmlDoc);`
	`17`	`+ List<VillageChecked> foundVills = RightBarParser.GetVillages(htmlDoc, acc.AccInfo.ServerVersion);`
`18`	`18`	`if (foundVills.Count == 0) return false; //some problem in GetVillages function!`
`19`	`19`
`20`	`20`	`for (int i = 0; i < acc.Villages.Count; i++)`