Merge pull request #97 from Erol444/hotfix-06-04-2022

Hotfix 06 04 2022

Author: vinaghost

TbsCore/Models/Logging/LogOutput.cs

@@ -36,6 +36,7 @@ public string GetLog(string username)
                 lock (objLock)
                 {
                     var log = string.Join("", _logs[username]);
+
                     return log;
                 }
             }
@@ -49,14 +50,17 @@ public string GetLastLog(string username)
 
         public void Add(string username, string message)
         {
-            _logs[username].AddFirst(message);
-            // keeps 200 message
-            while (_logs[username].Count > 200)
+            lock (objLock)
             {
-                _logs[username].RemoveLast();
-            }
+                _logs[username].AddFirst(message);
+                // keeps 200 message
+                while (_logs[username].Count > 200)
+                {
+                    _logs[username].RemoveLast();
+                }
 
-            OnUpdateLog(username);
+                OnUpdateLog(username);
+            }
         }
 
         public void AddUsername(string username)

TbsCore/Tasks/LowLevel/HeroEquip.cs

@@ -21,7 +21,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 var (item, amount) = use;
 
                 var (category, _, _) = HeroHelper.ParseHeroItem(item);
-                if (category != HeroItemCategory.Resource || category != HeroItemCategory.Stackable || category != HeroItemCategory.NonStackable)
+                if (category != HeroItemCategory.Resource && category != HeroItemCategory.Stackable && category != HeroItemCategory.NonStackable)
                 {
                     // Check if hero is at home
                     if (acc.Hero.Status != Hero.StatusEnum.Home)

TbsCore/Tasks/LowLevel/SellOnAuctions.cs

@@ -11,7 +11,10 @@ namespace TbsCore.Tasks.LowLevel
 {
     public class SellOnAuctions : BotTask
     {
+        private readonly Random rand = new Random();
+
         public override async Task<TaskRes> Execute(Account acc)
+
         {
             if (acc.AccInfo.ServerVersion == ServerVersionEnum.TTwars) return TaskRes.Executed;
             if (!acc.Wb.CurrentUrl.Contains("auction?action=sell"))
@@ -87,7 +90,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 var element = acc.Wb.Driver.FindElement(By.XPath(nodeItemXPath.XPath));
                 if (element == null) continue;
                 element.Click();
-                await Task.Delay(600);
+                await Task.Delay(rand.Next(1500, 2500));
 
                 int counter = 3;
                 do

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -1,4 +1,5 @@
 using HtmlAgilityPack;
+using OpenQA.Selenium;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -35,6 +36,7 @@ public override async Task<TaskRes> Execute(Account acc)
                     await SwitchVillage(acc);
 
                     var firstComplete = Vill.Build.CurrentlyBuilding.FirstOrDefault();
+                    if (firstComplete == null) continue;
                     NextExecute = TimeHelper.RanDelay(acc, firstComplete.Duration);
                     acc.Logger.Information($"Next building will be contructed after {firstComplete.Building} - level {firstComplete.Level} complete. ({NextExecute})", this);
                     return TaskRes.Executed;
@@ -122,7 +124,7 @@ public override async Task<TaskRes> Execute(Account acc)
                         acc.Logger.Warning($"Not enough resources to construct {_buildingTask.Building} - Level {_buildingTask.Level}! Needed {cost}. Bot will try finish the task later", this);
                         DateTime enoughRes = TimeHelper.EnoughResToUpgrade(Vill, stillNeededRes);
                         NextExecute = TimeHelper.RanDelay(acc, enoughRes);
-                        continue;
+                        return TaskRes.Executed;
                     }
                     var heroRes = HeroHelper.GetHeroResources(acc);
 
@@ -265,11 +267,12 @@ private async Task<bool> Upgrade(Account acc, HtmlNode node)
             var watchAd = false;
             if (acc.AccInfo.ServerVersion == ServerVersionEnum.T4_5 && buildDuration.TotalMinutes > acc.Settings.WatchAdAbove)
             {
-                watchAd = await TryFastUpgrade(acc);
+                // watchAd = await TryFastUpgrade(acc);
             }
 
             if (!watchAd)
             {
+                upgradeButton = buttons.FirstOrDefault(x => x.HasClass("build"));
                 await DriverHelper.ClickById(acc, upgradeButton.Id); // Normal upgrade
             }
 
@@ -321,65 +324,68 @@ private void PostTaskCheckDorf(Account acc)
         /// <returns>Whether bot watched the ad</returns>
         private async Task<bool> TryFastUpgrade(Account acc)
         {
-            if (!await DriverHelper.ClickByClassName(acc, "videoFeatureButton green", log: false)) return false;
-            await Task.Delay(AccountHelper.Delay(acc));
+            acc.Wb.UpdateHtml();
+            var nodeFastUpgrade = acc.Wb.Html.DocumentNode.Descendants("button").FirstOrDefault(x => x.HasClass("videoFeatureButton") && x.HasClass("green"));
+            if (nodeFastUpgrade == null) return false;
+            var elementFastUpgrade = acc.Wb.Driver.FindElement(By.XPath(nodeFastUpgrade.XPath));
+            if (elementFastUpgrade == null) return false;
+            elementFastUpgrade.Click();
+
+            await Task.Delay(rand.Next(1000, 2000));
 
             // Confirm
             acc.Wb.UpdateHtml();
-            if (acc.Wb.Html.DocumentNode.SelectSingleNode("//input[@name='adSalesVideoInfoScreen']") != null)
+            var node = acc.Wb.Html.DocumentNode.SelectSingleNode("//input[@name='adSalesVideoInfoScreen']");
+            if (node != null)
             {
-                await DriverHelper.ClickByName(acc, "adSalesVideoInfoScreen");
-                await Task.Delay(AccountHelper.Delay(acc));
-
+                var element = acc.Wb.Driver.FindElement(By.XPath(node.XPath));
+                if (element == null)
+                {
+                    await acc.Wb.Refresh();
+                    return false;
+                }
+                element.Click();
                 await DriverHelper.ExecuteScript(acc, "jQuery(window).trigger('showVideoWindowAfterInfoScreen')");
-                await Task.Delay(AccountHelper.Delay(acc));
             }
 
-            while (true)
+            await Task.Delay(rand.Next(10000, 18000));
+
+            // click to play video
+            acc.Wb.UpdateHtml();
+            var nodeIframe = acc.Wb.Html.GetElementbyId("videoFeature");
+            if (nodeIframe == null)
             {
-                acc.Wb.UpdateHtml();
-                var node = acc.Wb.Html.GetElementbyId("videoFeature");
-                if (node == null) continue;
-                var element = acc.Wb.Driver.FindElementById("videoFeature");
-                if (element == null) continue;
-                element.Click();
-                break;
+                await acc.Wb.Refresh();
+                return false;
             }
-            // Has to be a legit "click"
-
-            // wait for finish watching ads
-            var timeout = DateTime.Now.AddSeconds(100);
-            do
+            var elementIframe = acc.Wb.Driver.FindElementById("videoFeature");
+            if (elementIframe == null)
             {
-                await Task.Delay(3000);
-
-                //skip ads from Travian Games
-                //they use ifarme to emebed ads video to their game
-                acc.Wb.UpdateHtml();
-
-                if (acc.Wb.Html.GetElementbyId("videoArea") != null)
-                {
-                    acc.Wb.SwitchTo().Frame(acc.Wb.FindElementById("videoArea"));
-
-                    // trick to skip
-                    await DriverHelper.ExecuteScript(acc, "var video = document.getElementsByTagName('video')[0];video.currentTime = video.duration - 1;", false, false);
-                    //back to first page
+                await acc.Wb.Refresh();
+                return false;
+            }
+            elementIframe.Click();
 
-                    acc.Wb.SwitchTo().DefaultContent();
-                }
-                if (timeout < DateTime.Now) return false;
+            try
+            {
+                await DriverHelper.WaitPageChange(acc, "dorf", 3);
+            }
+            catch
+            {
+                await acc.Wb.Refresh();
+                return false;
             }
-            while (acc.Wb.CurrentUrl.Contains("build.php"));
 
             // Don't show again
-            await Task.Delay(1000);
+            await Task.Delay(rand.Next(1000, 2000));
             acc.Wb.UpdateHtml();
 
             if (acc.Wb.Html.GetElementbyId("dontShowThisAgain") != null)
             {
                 await DriverHelper.ClickById(acc, "dontShowThisAgain");
                 await Task.Delay(800);
                 await DriverHelper.ClickByClassName(acc, "dialogButtonOk ok");
+                await acc.Wb.Refresh();
             }
 
             return true;

TravBotSharp/ControlPanel.cs

@@ -319,6 +319,7 @@ private void button5_Click(object sender, EventArgs e) // Logout
                     button2.Invoke(new Action(() => button2.Enabled = false));
                 }
             });
+            thread.Start();
         }
 
         private void button6_Click(object sender, EventArgs e) // Login all accounts