From 85d2f8d8424a4bf3bb17210cdfacc19f458dde49 Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Sat, 13 Feb 2021 23:11:46 +0000
Subject: [PATCH] adjustments

---
 CLI/BetterRelayService/BetterRelay.cs | 34 +++++++--------------------
 Core/Commands/commandlib.cs           |  1 +
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/CLI/BetterRelayService/BetterRelay.cs b/CLI/BetterRelayService/BetterRelay.cs
index 9b0094c..8f7a28a 100644
--- a/CLI/BetterRelayService/BetterRelay.cs
+++ b/CLI/BetterRelayService/BetterRelay.cs
@@ -197,13 +197,10 @@ namespace BetterSecondBot.BetterRelayService
                         packet.discord_messageid = discordMessageid;
                     }
                     sendmessage = JsonConvert.SerializeObject(packet);
-                    LogFormater.Info("Created json packet");
                 }
 
-                LogFormater.Info("Attempting to check if: "+ cfg.sourcevalue+" == "+filtervalue+"");
                 if (((cfg.sourcevalue == "all") && (sourcetype != "discordchat")) || (cfg.sourcevalue == filtervalue))
                 {
-                    LogFormater.Info("passed source filter");
                     if (cfg.targetname == "discord")
                     {
                         string[] cfga = cfg.targetvalue.Split("@");
@@ -211,20 +208,14 @@ namespace BetterSecondBot.BetterRelayService
                         {
                             if ((cfga[0] + "@" + cfga[1]) != filtervalue)
                             {
-                                LogFormater.Info("sending via discord");
                                 await controler.Bot.SendMessageToDiscord(cfga[0], cfga[1], sendmessage, false);
                             }
-                            else
-                            {
-                                LogFormater.Info("Blocked - source is the same as target");
-                            }
                         }
                     }
                     else if (cfg.targetname == "localchat")
                     {
                         int chan = 0;
                         int.TryParse(cfg.targetvalue, out chan);
-                        LogFormater.Info("sending via localchat");
                         controler.Bot.GetClient.Self.Chat(sendmessage, chan, ChatType.Normal);
                     }
                     else if (cfg.targetname == "avatarchat")
@@ -233,33 +224,26 @@ namespace BetterSecondBot.BetterRelayService
                         {
                             if (UUID.TryParse(cfg.targetvalue, out UUID target) == true)
                             {
-                                LogFormater.Info("sending via im");
                                 controler.Bot.SendIM(target, sendmessage);
                             }
-                            else
-                            {
-                                LogFormater.Info("Blocked - source is the same as target");
-                            }
                         }
                     }
                     else if (cfg.targetname == "groupchat")
                     {
-                        LogFormater.Info("processing as groupchat");
                         if (cfg.targetvalue != filtervalue)
                         {
-                            LogFormater.Info("sending via groupchat");
-                            controler.Bot.GetCommandsInterface.Call("Groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~");
-                        }
-                        else
-                        {
-                            LogFormater.Info("Blocked - source is the same as target");
+                            bool status = controler.Bot.GetCommandsInterface.Call("groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~");
+                            if(status == false)
+                            {
+                                LogFormater.Info("sending via groupchat to group: " + cfg.targetvalue + " [Failed]");
+                            }
+                            else
+                            {
+                                LogFormater.Info("sending via groupchat to group: " + cfg.targetvalue+" [OK]");
+                            }
                         }
                     }
                 }
-                else
-                {
-                    LogFormater.Info("Did not pass source filter");
-                }
             }
         }
 
diff --git a/Core/Commands/commandlib.cs b/Core/Commands/commandlib.cs
index 7279d0d..b76cea0 100644
--- a/Core/Commands/commandlib.cs
+++ b/Core/Commands/commandlib.cs
@@ -389,6 +389,7 @@ namespace BSB.Commands
         public bool Failed(string why_failed)
         {
             InfoBlob = why_failed;
+            LogFormater.Warn("Called failed because: " + why_failed);
             return false;
         }
     }