rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adjustments

Browse source
This commit is contained in:
Madpeterz 2021-02-13 23:11:46 +00:00
parent d3fe8ba19f
commit 85d2f8d842
2 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
CLI/BetterRelayService/BetterRelay.cs
View file

@ -197,13 +197,10 @@ namespace BetterSecondBot.BetterRelayService
packet.discord_messageid = discordMessageid; packet.discord_messageid = discordMessageid;
} }
sendmessage = JsonConvert.SerializeObject(packet); 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)) if (((cfg.sourcevalue == "all") && (sourcetype != "discordchat")) || (cfg.sourcevalue == filtervalue))
{ {
LogFormater.Info("passed source filter");
if (cfg.targetname == "discord") if (cfg.targetname == "discord")
{ {
string[] cfga = cfg.targetvalue.Split("@"); string[] cfga = cfg.targetvalue.Split("@");
@ -211,20 +208,14 @@ namespace BetterSecondBot.BetterRelayService
{ {
if ((cfga[0] + "@" + cfga[1]) != filtervalue) if ((cfga[0] + "@" + cfga[1]) != filtervalue)
{ {
LogFormater.Info("sending via discord");
await controler.Bot.SendMessageToDiscord(cfga[0], cfga[1], sendmessage, false); 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") else if (cfg.targetname == "localchat")
{ {
int chan = 0; int chan = 0;
int.TryParse(cfg.targetvalue, out chan); int.TryParse(cfg.targetvalue, out chan);
LogFormater.Info("sending via localchat");
controler.Bot.GetClient.Self.Chat(sendmessage, chan, ChatType.Normal); controler.Bot.GetClient.Self.Chat(sendmessage, chan, ChatType.Normal);
} }
else if (cfg.targetname == "avatarchat") else if (cfg.targetname == "avatarchat")
@ -233,33 +224,26 @@ namespace BetterSecondBot.BetterRelayService
{ {
if (UUID.TryParse(cfg.targetvalue, out UUID target) == true) if (UUID.TryParse(cfg.targetvalue, out UUID target) == true)
{ {
LogFormater.Info("sending via im");
controler.Bot.SendIM(target, sendmessage); controler.Bot.SendIM(target, sendmessage);
} }
else
{
LogFormater.Info("Blocked - source is the same as target");
}
} }
} }
else if (cfg.targetname == "groupchat") else if (cfg.targetname == "groupchat")
{ {
LogFormater.Info("processing as groupchat");
if (cfg.targetvalue != filtervalue) if (cfg.targetvalue != filtervalue)
{ {
LogFormater.Info("sending via groupchat"); bool status = controler.Bot.GetCommandsInterface.Call("groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~");
controler.Bot.GetCommandsInterface.Call("Groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~"); if(status == false)
} {
else LogFormater.Info("sending via groupchat to group: " + cfg.targetvalue + " [Failed]");
{ }
LogFormater.Info("Blocked - source is the same as target"); else
{
LogFormater.Info("sending via groupchat to group: " + cfg.targetvalue+" [OK]");
}
} }
} }
} }
else
{
LogFormater.Info("Did not pass source filter");
}
} }
} }

1
Core/Commands/commandlib.cs
View file

@ -389,6 +389,7 @@ namespace BSB.Commands
public bool Failed(string why_failed) public bool Failed(string why_failed)
{ {
InfoBlob = why_failed; InfoBlob = why_failed;
LogFormater.Warn("Called failed because: " + why_failed);
return false; return false;
} }
} }