update command interface to be less bad

This commit is contained in:
Madpeter 2023-12-07 10:30:08 +00:00
parent 36c7f020b5
commit 61c45e9e79

View file

@ -184,9 +184,9 @@ namespace SecondBotEvents.Services
return false; return false;
} }
public KeyValuePair<bool, string> CommandInterfaceCaller(string message, bool requireSigning=false, bool viaCustomCommand=false) public KeyValuePair<bool, string> CommandInterfaceCaller(string message, bool requireSigning=false, bool viaCustomCommand=false, string forceSetSource= "command interface")
{ {
string source = "command interface"; string source = forceSetSource;
if(viaCustomCommand == true) if(viaCustomCommand == true)
{ {
source = "customcommand"; source = "customcommand";
@ -197,10 +197,6 @@ namespace SecondBotEvents.Services
return new KeyValuePair<bool, string>(false, "Not accepted via signing"); return new KeyValuePair<bool, string>(false, "Not accepted via signing");
} }
KeyValuePair<bool, string> reply = RunCommand(C, viaCustomCommand); KeyValuePair<bool, string> reply = RunCommand(C, viaCustomCommand);
if (C.replyTarget != null)
{
SmartCommandReply(C.replyTarget, reply.Value, C.command);
}
return reply; return reply;
} }
@ -330,7 +326,12 @@ namespace SecondBotEvents.Services
} }
return master.CustomCommandsService.RunCommand(C); return master.CustomCommandsService.RunCommand(C);
} }
return RunBaseCommand(C); KeyValuePair<bool,string> reply = RunBaseCommand(C);
if (C.replyTarget != null)
{
SmartCommandReply(C.replyTarget, reply.Value, C.command);
}
return reply;
} }
catch (Exception e) catch (Exception e)