diff --git a/ArchiSteamFarm/Commands.cs b/ArchiSteamFarm/Commands.cs index b7b6cfe5f..33d3060e8 100644 --- a/ArchiSteamFarm/Commands.cs +++ b/ArchiSteamFarm/Commands.cs @@ -72,14 +72,14 @@ namespace ArchiSteamFarm { } [PublicAPI] - public async Task Response(ulong steamID, string message) { + public async Task Response(ulong steamID, string message, bool useCommandPrefix = true) { if ((steamID == 0) || string.IsNullOrEmpty(message)) { Bot.ArchiLogger.LogNullError(nameof(steamID) + " || " + nameof(message)); return null; } - if (!string.IsNullOrEmpty(Program.GlobalConfig.CommandPrefix)) { + if (useCommandPrefix && !string.IsNullOrEmpty(Program.GlobalConfig.CommandPrefix)) { if (!message.StartsWith(Program.GlobalConfig.CommandPrefix, StringComparison.Ordinal)) { string pluginsResponse = await Core.OnBotMessage(Bot, steamID, message).ConfigureAwait(false); diff --git a/ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs b/ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs index ad13b6e6b..83df54af6 100644 --- a/ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs +++ b/ArchiSteamFarm/IPC/Controllers/Api/CommandController.cs @@ -55,11 +55,11 @@ namespace ArchiSteamFarm.IPC.Controllers.Api { return BadRequest(new GenericResponse(false, Strings.ErrorNoBotsDefined)); } - if (!string.IsNullOrEmpty(Program.GlobalConfig.CommandPrefix) && !command.StartsWith(Program.GlobalConfig.CommandPrefix, StringComparison.Ordinal)) { - command = Program.GlobalConfig.CommandPrefix + command; + if (!string.IsNullOrEmpty(Program.GlobalConfig.CommandPrefix) && command.StartsWith(Program.GlobalConfig.CommandPrefix, StringComparison.Ordinal)) { + command = command.Substring(Program.GlobalConfig.CommandPrefix.Length); } - string response = await targetBot.Commands.Response(Program.GlobalConfig.SteamOwnerID, command).ConfigureAwait(false); + string response = await targetBot.Commands.Response(Program.GlobalConfig.SteamOwnerID, command, false).ConfigureAwait(false); return Ok(new GenericResponse(response)); }