diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj
index fde69a4..e730229 100644
--- a/DiscordBot/DiscordBot.csproj
+++ b/DiscordBot/DiscordBot.csproj
@@ -7,7 +7,7 @@
False
True
- 1.0.3.0
+ 1.0.3.2
none
diff --git a/PluginManager/Bot/CommandHandler.cs b/PluginManager/Bot/CommandHandler.cs
index 021a1a3..13307e0 100644
--- a/PluginManager/Bot/CommandHandler.cs
+++ b/PluginManager/Bot/CommandHandler.cs
@@ -6,6 +6,7 @@ using Discord.Commands;
using Discord.WebSocket;
using PluginManager.Interfaces;
using PluginManager.Loaders;
+using PluginManager.Online;
using PluginManager.Others;
using PluginManager.Others.Permissions;
@@ -13,9 +14,9 @@ namespace PluginManager.Bot;
internal class CommandHandler
{
- private readonly string _botPrefix;
- private readonly DiscordSocketClient _client;
- private readonly CommandService _commandService;
+ private readonly string _botPrefix;
+ private readonly DiscordSocketClient _client;
+ private readonly CommandService _commandService;
///
/// Command handler constructor
@@ -45,10 +46,10 @@ internal class CommandHandler
{
try
{
- var plugin = PluginLoader.SlashCommands!.FirstOrDefault(p => p.Name == arg.Data.Name);
+ var plugin = PluginLoader.SlashCommands.FirstOrDefault(p => p.Name == arg.Data.Name);
if (plugin is null)
- throw new Exception("Failed to run command. !");
+ throw new Exception("Failed to run command !");
if (arg.Channel is SocketDMChannel)
diff --git a/PluginManager/Loaders/FileLoaderResult.cs b/PluginManager/Loaders/FileLoaderResult.cs
index c75bf26..3036dba 100644
--- a/PluginManager/Loaders/FileLoaderResult.cs
+++ b/PluginManager/Loaders/FileLoaderResult.cs
@@ -2,9 +2,9 @@ namespace PluginManager.Loaders;
public class FileLoaderResult
{
- public string PluginName { get; init; }
+ public string PluginName { get; private set; }
- public string? ErrorMessage { get; init; }
+ public string ErrorMessage { get; private set; }
public FileLoaderResult(string pluginName, string errorMessage)
@@ -16,5 +16,6 @@ public class FileLoaderResult
public FileLoaderResult(string pluginName)
{
PluginName = pluginName;
+ ErrorMessage = string.Empty;
}
}
diff --git a/PluginManager/Loaders/PluginLoadResultData.cs b/PluginManager/Loaders/PluginLoadResultData.cs
index 42c3795..f9ac853 100644
--- a/PluginManager/Loaders/PluginLoadResultData.cs
+++ b/PluginManager/Loaders/PluginLoadResultData.cs
@@ -9,14 +9,15 @@ public class PluginLoadResultData
public string? ErrorMessage { get; init; }
public bool IsSuccess { get; init; }
- public object? Plugin { get; init; }
+ public object Plugin { get; init; }
- public PluginLoadResultData(string pluginName, PluginType pluginType, bool isSuccess, string? errorMessage = null, object plugin = null)
+ public PluginLoadResultData(string pluginName, PluginType pluginType, bool isSuccess, string? errorMessage = null,
+ object? plugin = null)
{
PluginName = pluginName;
PluginType = pluginType;
IsSuccess = isSuccess;
ErrorMessage = errorMessage;
- Plugin = plugin;
+ Plugin = plugin is null ? new() : plugin;
}
}
diff --git a/PluginManager/Loaders/PluginLoader.cs b/PluginManager/Loaders/PluginLoader.cs
index 2e0a0e1..d009917 100644
--- a/PluginManager/Loaders/PluginLoader.cs
+++ b/PluginManager/Loaders/PluginLoader.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
using Discord.WebSocket;
using PluginManager.Interfaces;
using PluginManager.Others;
-using PluginManager.Updater.Plugins;
+
namespace PluginManager.Loaders;
@@ -21,9 +21,9 @@ public class PluginLoader
public EventLoaded? OnEventLoaded;
public SlashCommandLoaded? OnSlashCommandLoaded;
- public static List? Commands;
- public static List? Events;
- public static List? SlashCommands;
+ public static List Commands { get; private set; } = new List();
+ public static List Events { get; private set; } = new List();
+ public static List SlashCommands { get; private set; } = new List();
public PluginLoader(DiscordSocketClient discordSocketClient)
{
@@ -32,10 +32,6 @@ public class PluginLoader
public async Task LoadPlugins()
{
- Commands = new List();
- Events = new List();
- SlashCommands = new List();
-
Config.Logger.Log("Loading plugins...", typeof(PluginLoader));
var loader = new Loader(Config.AppSettings["PluginFolder"], "dll");