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

Update BetterRelay.cs

Browse source
This commit is contained in:
Madpeterz 2021-02-13 22:26:56 +00:00
parent 8f7a6ba3b3
commit 66ed7183dd
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
CLI/BetterRelayService/BetterRelay.cs
View file

@ -1,6 +1,7 @@
using BetterSecondBot.DiscordSupervisor; using BetterSecondBot.DiscordSupervisor;
using BetterSecondBotShared.IO; using BetterSecondBotShared.IO;
using BetterSecondBotShared.Json; using BetterSecondBotShared.Json;
using BetterSecondBotShared.logs;
using BetterSecondBotShared.Static; using BetterSecondBotShared.Static;
using BSB.bottypes; using BSB.bottypes;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -176,6 +177,8 @@ namespace BetterSecondBot.BetterRelayService
return; return;
} }
message = "[relay] " + sourcetype + " # " + name + ": " + message; message = "[relay] " + sourcetype + " # " + name + ": " + message;
foreach (relay_config cfg in Dataset) foreach (relay_config cfg in Dataset)
{ {
relay_packet packet = new relay_packet(); relay_packet packet = new relay_packet();
@ -194,11 +197,13 @@ 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("@");
@ -206,14 +211,20 @@ 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")
@ -222,18 +233,33 @@ 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");
controler.Bot.GetCommandsInterface.Call("Groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~"); controler.Bot.GetCommandsInterface.Call("Groupchat", cfg.targetvalue + "~#~" + sendmessage, UUID.Zero, "~#~");
} }
else
{
LogFormater.Info("Blocked - source is the same as target");
}
} }
} }
else
{
LogFormater.Info("Did not pass source filter");
}
} }
} }