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

Update CommandsBot.cs

Browse source 
change CallAPI to also return the status
This commit is contained in:
Madpeterz 2021-04-02 20:49:58 +01:00
parent 019465edb1
commit 50ad82afc9
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Core/bottypes/CommandsBot.cs
View file

@ -79,9 +79,9 @@ namespace BetterSecondBot.bottypes
}
public override void SendIM(UUID avatar,string message)
{
base.SendIM(avatar, message);
AddToIMchat(avatar, GetClient.Self.Name, message);
Client.Self.InstantMessage(avatar, message);
base.SendIM(avatar, message);
}
protected Dictionary<string, string> notecards_content = new Dictionary<string, string>();
@ -307,7 +307,7 @@ namespace BetterSecondBot.bottypes
MethodInfo theMethod = Endpoint.GetType().GetMethod(command);
List<string> argsList = args.ToList();
argsList.Add(ott);
string reply = "Inconnect number of args";
string reply = "Inconnect number of args expected: "+ theMethod.GetParameters().Count().ToString()+" but got: "+ argsList.Count.ToString();
bool status = false;
if (argsList.Count == theMethod.GetParameters().Count())
{
@ -341,27 +341,27 @@ namespace BetterSecondBot.bottypes
}
}
public void CallAPI(string command, string[] args)
public string CallAPI(string command, string[] args)
{
CallAPI(command, args, "None");
return CallAPI(command, args, "None");
}
public void CallAPI(string command, string[] args, string replyvia)
public string CallAPI(string command, string[] args, string replyvia)
{
CallAPI(command, args, replyvia, false);
return CallAPI(command, args, replyvia, false);
}
public void CallAPI(string command, string[] args, string replyvia, bool customcommand)
public string CallAPI(string command, string[] args, string replyvia, bool customcommand)
{
if(commandnameLowerToReal.ContainsKey(command.ToLowerInvariant()) == false)
{
if (custom_commands.ContainsKey(command) == false)
{
SmartCommandReply(false, replyvia, "Unknown command", command);
return;
return "{ status: \"false\", message: \"Unknown\" }";
}
if(customcommand == true)
{
SmartCommandReply(false, replyvia, "Custom command lockout", command);
return;
return "{ status: \"false\", message: \"Custom command lockout\" }";
}
foreach (string A in custom_commands[command])
{
@ -379,10 +379,11 @@ namespace BetterSecondBot.bottypes
}
CallAPI(command_args_split[0], args_passed.Split("~#~"),"None",true);
}
return;
return "{ status: \"true\", message: \"mixed reply cuistom command\" }";
}
KeyValuePair<bool, string> statusreply = callAPIcommand(command, args);
SmartCommandReply(statusreply.Key, replyvia, statusreply.Value, command);
return "{ status: \"" + statusreply.Key.ToString() + "\", message: \""+ statusreply.Value+"\" command: \""+command+"\", args: \""+string.Join("~#~",args)+"\" }";
}
protected HttpClient HTTPclient = new HttpClient();