From 1f407785b856df5a05c9da25e3629dcdbf324f56 Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Wed, 19 May 2021 21:42:20 +0100
Subject: [PATCH] cleanup

---
 BetterSecondbot/Adverts/advertsService.cs | 24 +++++--------------
 BetterSecondbot/Cli.cs                    | 29 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/BetterSecondbot/Adverts/advertsService.cs b/BetterSecondbot/Adverts/advertsService.cs
index bbb8171..9bc93df 100644
--- a/BetterSecondbot/Adverts/advertsService.cs
+++ b/BetterSecondbot/Adverts/advertsService.cs
@@ -188,27 +188,15 @@ namespace BetterSecondbot.Adverts
         protected int lastTickMin = -1;
         protected void StatusPing(object o, StatusMessageEvent e)
         {
-            DateTime moment = DateTime.Now;
-            if (lastTickMin != moment.Minute)
+            if (controler.BotReady() == true)
             {
-                lastTickMin = moment.Minute;
-                if (controler.getBot() == null)
+                DateTime moment = DateTime.Now;
+                if (lastTickMin != moment.Minute)
                 {
-                    return;
+                    lastTickMin = moment.Minute;
+
+                    checkForWork();
                 }
-                if(controler.getBot().GetClient == null)
-                {
-                    return;
-                }
-                if (controler.getBot().GetClient.Network == null)
-                {
-                    return;
-                }
-                if (controler.getBot().GetClient.Network.CurrentSim == null)
-                {
-                    return;
-                }
-                checkForWork();
             }
         }
 
diff --git a/BetterSecondbot/Cli.cs b/BetterSecondbot/Cli.cs
index 404106c..e038bcc 100644
--- a/BetterSecondbot/Cli.cs
+++ b/BetterSecondbot/Cli.cs
@@ -9,6 +9,7 @@ using BetterSecondbot.BetterAtHome;
 using BetterSecondbot.DataStorage;
 using BetterSecondbot.Tracking;
 using BetterSecondbot.Adverts;
+using BetterSecondbot.OnEvents;
 
 namespace BetterSecondBot
 {
@@ -21,6 +22,7 @@ namespace BetterSecondBot
         protected BetterAtHome betterAtHomeService;
         protected BetterTracking betterTracking;
         protected advertsService Adverts;
+        protected onevent Events;
         protected Datastorage datastorage;
 
         public SecondBot getBot()
@@ -28,6 +30,31 @@ namespace BetterSecondBot
             return Bot;
         }
 
+        public bool BotReady()
+        {
+            if (getBot() == null)
+            {
+                return false;
+            }
+            else if (getBot().GetClient == null)
+            {
+                return false;
+            }
+            else if (getBot().GetClient.Network == null)
+            {
+                return false;
+            }
+            else if (getBot().GetClient.Network.Connected == false)
+            {
+                return false;
+            }
+            else if (getBot().GetClient.Network.CurrentSim == null)
+            {
+                return false;
+            }
+            return true;
+        }
+
         public string getFolderUsed()
         {
             return use_folder;
@@ -50,6 +77,7 @@ namespace BetterSecondBot
                 Thread.Sleep(1500);
             }
             Adverts = null;
+            Events = null;
             betterAtHomeService = null;
             betterTracking = null;
             datastorage = null;
@@ -68,6 +96,7 @@ namespace BetterSecondBot
                 }).Start();
             }
             Adverts = new advertsService(this, as_docker);
+            Events = new onevent(this, as_docker);
             betterAtHomeService = new BetterAtHome(this, Config);
             betterTracking = new BetterTracking(this);
             datastorage = new Datastorage(this);