andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Help command loading when using the new context

Browse Source
This commit is contained in:
Andrei Tudor
2025-05-22 18:53:22 +03:00
parent a0177ce145
commit 14ca51b18a
5 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DiscordBotCore/Bot/CommandHandler.cs
View File

@@ -18,7 +18,8 @@ namespace DiscordBotCore.Bot;
internal class CommandHandler : ICommandHandler
{
private readonly string _botPrefix;
private static readonly string _DefaultPrefix = ";";
private readonly CommandService _commandService;
private readonly ILogger _logger;
private readonly IPluginLoader _pluginLoader;
@@ -31,10 +32,9 @@ internal class CommandHandler : ICommandHandler
/// <param name="commandService">The discord bot command service</param>
/// <param name="botPrefix">The prefix to watch for</param>
/// <param name="logger">The logger</param>
public CommandHandler(ILogger logger, IPluginLoader pluginLoader, IConfiguration configuration, CommandService commandService, string botPrefix)
public CommandHandler(ILogger logger, IPluginLoader pluginLoader, IConfiguration configuration, CommandService commandService)
{
_commandService = commandService;
_botPrefix = botPrefix;
_logger = logger;
_pluginLoader = pluginLoader;
_configuration = configuration;
@@ -94,7 +94,9 @@ internal class CommandHandler : ICommandHandler
var argPos = 0;
if (!message.Content.StartsWith(_botPrefix) && !message.HasMentionPrefix(socketClient.CurrentUser, ref argPos))
string botPrefix = this._configuration.Get<string>("prefix", _DefaultPrefix);
if (!message.Content.StartsWith(botPrefix) && !message.HasMentionPrefix(socketClient.CurrentUser, ref argPos))
return;
var context = new SocketCommandContext(socketClient, message);
@@ -125,13 +127,13 @@ internal class CommandHandler : ICommandHandler
{
plugin = _pluginLoader.Commands!
.FirstOrDefault(p => p.Command ==
message.Content.Split(' ')[0].Substring(_botPrefix.Length) ||
message.Content.Split(' ')[0].Substring(botPrefix.Length) ||
p.Aliases.Contains(
message.Content.Split(' ')[0]
.Substring(_botPrefix.Length)
.Substring(botPrefix.Length)
)
);
cleanMessage = message.Content.Substring(_botPrefix.Length);
cleanMessage = message.Content.Substring(botPrefix.Length);
}
if (plugin is null)

4
DiscordBotCore/Bot/DiscordBotApplication.cs
View File

@@ -14,8 +14,6 @@ public class DiscordBotApplication : IDiscordBotApplication
{
internal static IPluginLoader _InternalPluginLoader;
private static readonly string _DefaultPrefix = ";";
private CommandHandler _CommandServiceHandler;
private CommandService _Service;
private readonly ILogger _Logger;
@@ -88,7 +86,7 @@ public class DiscordBotApplication : IDiscordBotApplication
await client.StartAsync();
_CommandServiceHandler = new CommandHandler(_Logger, _pluginLoader, _Configuration, _Service, _Configuration.Get<string>("prefix", _DefaultPrefix));
_CommandServiceHandler = new CommandHandler(_Logger, _pluginLoader, _Configuration, _Service);
await _CommandServiceHandler.InstallCommandsAsync(client);