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

maybe correct issues with custom commands

Browse source
This commit is contained in:
Madpeterz 2021-06-02 18:33:49 +01:00
parent 69b4ef9e15
commit f304ad61f8
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BetterSecondbot/DiscordSupervisor/Inbound.cs
View file

@ -127,6 +127,7 @@ namespace BetterSecondBot.DiscordSupervisor
{ {
reply = controler.getBot().CallAPI(bits[0], args.Split("~#~"), target); reply = controler.getBot().CallAPI(bits[0], args.Split("~#~"), target);
} }
await MarkMessage(message, "✅").ConfigureAwait(false);
await message.Channel.SendMessageAsync(reply, false, null,null,null, new MessageReference(message.Id)).ConfigureAwait(false); await message.Channel.SendMessageAsync(reply, false, null,null,null, new MessageReference(message.Id)).ConfigureAwait(false);
} }
else else

14
Core/bottypes/CommandsBot.cs
View file

@ -406,8 +406,9 @@ namespace BetterSecondBot.bottypes
if (customcommand == true) if (customcommand == true)
{ {
SmartCommandReply(false, replyvia, "Custom command lockout", command); SmartCommandReply(false, replyvia, "Custom command lockout", command);
return "{ status: \"false\", message: \"Custom command lockout\" }"; return "Custom command lockout";
} }
int commands_issued = 0;
foreach (string A in custom_commands[command]) foreach (string A in custom_commands[command])
{ {
List<string> command_args_split = A.Split(new[] { "|||" }, StringSplitOptions.RemoveEmptyEntries).ToList(); List<string> command_args_split = A.Split(new[] { "|||" }, StringSplitOptions.RemoveEmptyEntries).ToList();
@ -423,8 +424,9 @@ namespace BetterSecondBot.bottypes
} }
} }
CallAPI(command_args_split[0], args_passed.Split("~#~"), "None", true); CallAPI(command_args_split[0], args_passed.Split("~#~"), "None", true);
commands_issued++;
} }
return "{ status: \"true\", message: \"mixed reply custom command\" }"; return "Issued "+ commands_issued.ToString()+" commands";
} }
public string CallAPI(string command, string[] args, string replyvia, bool customcommand) public string CallAPI(string command, string[] args, string replyvia, bool customcommand)
{ {
@ -436,6 +438,7 @@ namespace BetterSecondBot.bottypes
{ {
replyvia = "none"; replyvia = "none";
} }
KeyValuePair<bool, string> statusreply = new KeyValuePair<bool, string>(false, "Not processed");
if (commandnameLowerToReal.ContainsKey(command.ToLowerInvariant()) == false) if (commandnameLowerToReal.ContainsKey(command.ToLowerInvariant()) == false)
{ {
if (custom_commands.ContainsKey(command) == false) if (custom_commands.ContainsKey(command) == false)
@ -443,9 +446,12 @@ namespace BetterSecondBot.bottypes
SmartCommandReply(false, replyvia, "Unknown command", command); SmartCommandReply(false, replyvia, "Unknown command", command);
return "{ status: \"false\", message: \"Unknown\" }"; return "{ status: \"false\", message: \"Unknown\" }";
} }
customCommand(command, args, replyvia, customcommand); statusreply = new KeyValuePair<bool, string>(true, customCommand(command, args, replyvia, customcommand));
}
else
{
statusreply = callAPIcommand(command, args);
} }
KeyValuePair<bool, string> statusreply = callAPIcommand(command, args);
SmartCommandReply(statusreply.Key, replyvia, statusreply.Value, command); SmartCommandReply(statusreply.Key, replyvia, statusreply.Value, command);
return "{ status: \"" + statusreply.Key.ToString() + "\", message: \""+ statusreply.Value+"\" command: \""+command+"\", args: \""+string.Join("~#~",args)+"\" }"; return "{ status: \"" + statusreply.Key.ToString() + "\", message: \""+ statusreply.Value+"\" command: \""+command+"\", args: \""+string.Join("~#~",args)+"\" }";
} }