diff --git a/DiscordBot/Discord/Actions/Plugin.cs b/DiscordBot/Discord/Actions/Plugin.cs index 57a2c02..55bbd71 100644 --- a/DiscordBot/Discord/Actions/Plugin.cs +++ b/DiscordBot/Discord/Actions/Plugin.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using PluginManager.Interfaces; using PluginManager.Loaders; diff --git a/DiscordBot/Entry.cs b/DiscordBot/Entry.cs index a030658..43219bb 100644 --- a/DiscordBot/Entry.cs +++ b/DiscordBot/Entry.cs @@ -21,6 +21,7 @@ namespace DiscordBot string assemblyPath = Path.Combine(folderPath, new AssemblyName(args.Name).Name + ".dll"); if (!File.Exists(assemblyPath)) return null; Assembly assembly = Assembly.LoadFrom(assemblyPath); + return assembly; } diff --git a/PluginManager/Bot/CommandHandler.cs b/PluginManager/Bot/CommandHandler.cs index a0bf94b..c456863 100644 --- a/PluginManager/Bot/CommandHandler.cs +++ b/PluginManager/Bot/CommandHandler.cs @@ -47,9 +47,7 @@ internal class CommandHandler { try { - var plugin = PluginLoader.SlashCommands! - .Where(p => p.Name == arg.Data.Name) - .FirstOrDefault(); + var plugin = PluginLoader.SlashCommands!.FirstOrDefault(p => p.Name == arg.Data.Name); if (plugin is null) throw new Exception("Failed to run command. !"); @@ -98,7 +96,7 @@ internal class CommandHandler await commandService.ExecuteAsync(context, argPos, null); - DBCommand plugin; + DBCommand? plugin; string cleanMessage = ""; if (message.HasMentionPrefix(client.CurrentUser, ref argPos)) @@ -132,7 +130,7 @@ internal class CommandHandler string[] split = cleanMessage.Split(' '); - string[] argsClean = null; + string[]? argsClean = null; if(split.Length > 1) argsClean = string.Join(' ', split, 1, split.Length-1).Split(' '); @@ -147,4 +145,4 @@ internal class CommandHandler Config.Logger.Log(ex.Message, this, LogLevel.ERROR); } } -} \ No newline at end of file +} diff --git a/PluginManager/Others/DBCommandExecutingArguments.cs b/PluginManager/Others/DBCommandExecutingArguments.cs index c697453..4604abc 100644 --- a/PluginManager/Others/DBCommandExecutingArguments.cs +++ b/PluginManager/Others/DBCommandExecutingArguments.cs @@ -15,7 +15,7 @@ namespace PluginManager.Others public string commandUsed { get;init; } public string[]? arguments { get;init; } - public DBCommandExecutingArguments(SocketCommandContext context, string cleanContent, string commandUsed, string[] arguments) + public DBCommandExecutingArguments(SocketCommandContext context, string cleanContent, string commandUsed, string[]? arguments) { this.context = context; this.cleanContent = cleanContent;