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

Updated code formatting

Browse Source
This commit is contained in:
Andrei Tudor
2025-05-30 12:09:48 +03:00
parent 11b9515bab
commit 81905460da
10 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DiscordBotCore/Bot/CommandHandler.cs
View File

@@ -122,7 +122,6 @@ internal class CommandHandler : ICommandHandler
cleanMessage = message.Content.Substring(mentionPrefix.Length + 1);
}
else
{
plugin = _pluginLoader.Commands!
@@ -137,16 +136,22 @@ internal class CommandHandler : ICommandHandler
}
if (plugin is null)
{
return;
}
if (plugin.RequireAdmin && !context.Message.Author.IsAdmin())
{
return;
}
var split = cleanMessage.Split(' ');
string[]? argsClean = null;
if (split.Length > 1)
{
argsClean = string.Join(' ', split, 1, split.Length - 1).Split(' ');
}
DbCommandExecutingArgument cmd = new(_logger,
context,
@@ -162,8 +167,13 @@ internal class CommandHandler : ICommandHandler
);
if (context.Channel is SocketDMChannel)
{
await plugin.ExecuteDm(cmd);
else await plugin.ExecuteServer(cmd);
}
else
{
await plugin.ExecuteServer(cmd);
}
}
catch (Exception ex)
{

10
DiscordBotCore/Bot/DiscordBotApplication.cs
View File

@@ -18,7 +18,7 @@ public class DiscordBotApplication : IDiscordBotApplication
private CommandService _Service;
private readonly ILogger _Logger;
private readonly IConfiguration _Configuration;
private readonly IPluginLoader _pluginLoader;
private readonly IPluginLoader _PluginLoader;
public bool IsReady { get; private set; }
@@ -29,9 +29,9 @@ public class DiscordBotApplication : IDiscordBotApplication
/// </summary>
public DiscordBotApplication(ILogger logger, IConfiguration configuration, IPluginLoader pluginLoader)
{
this._Logger = logger;
this._Logger = logger;
this._Configuration = configuration;
this._pluginLoader = pluginLoader;
this._PluginLoader = pluginLoader;
_InternalPluginLoader = pluginLoader;
}
@@ -86,7 +86,7 @@ public class DiscordBotApplication : IDiscordBotApplication
await client.StartAsync();
_CommandServiceHandler = new CommandHandler(_Logger, _pluginLoader, _Configuration, _Service);
_CommandServiceHandler = new CommandHandler(_Logger, _PluginLoader, _Configuration, _Service);
await _CommandServiceHandler.InstallCommandsAsync(client);
@@ -115,7 +115,7 @@ public class DiscordBotApplication : IDiscordBotApplication
private Task LoggedIn()
{
_Logger.Log("Successfully Logged In", this);
_pluginLoader.SetDiscordClient(Client);
_PluginLoader.SetDiscordClient(Client);
return Task.CompletedTask;
}