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

More fixes to the new config. Module loader reworked

Browse Source
This commit is contained in:
Andrei Tudor
2024-08-06 22:47:59 +03:00
parent 27e25a9166
commit 18a059af0e
51 changed files with 390 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DiscordBotCore/Loaders/Loader.cs
View File

@@ -35,9 +35,9 @@ internal class Loader
}
}
await LoadEverythingOfType<DBEvent>();
await LoadEverythingOfType<DBCommand>();
await LoadEverythingOfType<DBSlashCommand>();
await LoadEverythingOfType<IDbEvent>();
await LoadEverythingOfType<IDbCommand>();
await LoadEverythingOfType<IDbSlashCommand>();
await LoadEverythingOfType<ICommandAction>();
}
@@ -60,9 +60,9 @@ internal class Loader
var pluginType = plugin switch
{
DBEvent => PluginType.EVENT,
DBCommand => PluginType.COMMAND,
DBSlashCommand => PluginType.SLASH_COMMAND,
IDbEvent => PluginType.EVENT,
IDbCommand => PluginType.COMMAND,
IDbSlashCommand => PluginType.SLASH_COMMAND,
ICommandAction => PluginType.ACTION,
_ => PluginType.UNKNOWN
};

23
DiscordBotCore/Loaders/ModuleLoader.cs
View File

@@ -6,23 +6,24 @@ using System.Threading.Tasks;
using DiscordBotCore.Interfaces.Modules;
using System.Reflection;
using DiscordBotCore.Modules;
namespace DiscordBotCore.Loaders
{
internal class ModuleLoader
{
private readonly string _ModuleFolder;
private readonly List<ModuleData> _ModuleData;
public ModuleLoader(string moduleFolder)
public ModuleLoader(List<ModuleData> moduleFolder)
{
_ModuleFolder = moduleFolder;
Directory.CreateDirectory(moduleFolder);
_ModuleData = moduleFolder;
}
public Task LoadFileModules()
{
var files = Directory.GetFiles(_ModuleFolder, "*.dll");
foreach (var file in files)
var paths = _ModuleData.Select(module => module.ModulePath);
foreach (var file in paths)
{
try
{
@@ -37,20 +38,20 @@ namespace DiscordBotCore.Loaders
return Task.CompletedTask;
}
public Task<List<IModule<T>>> LoadModules<T>() where T : IBaseModule
public Task<List<IModule>> LoadModules()
{
var moduleType = typeof(IModule<T>);
var moduleType = typeof(IModule);
var moduleTypes = AppDomain.CurrentDomain.GetAssemblies()
.SelectMany(s => s.GetTypes())
.Where(p => moduleType.IsAssignableFrom(p) && !p.IsInterface);
var modules = new List<IModule<T>>();
var modules = new List<IModule>();
foreach (var module in moduleTypes)
{
try
{
var instance = (IModule<T>?)Activator.CreateInstance(module);
if (instance == null)
var instance = (IModule?)Activator.CreateInstance(module);
if (instance is null)
{
Console.WriteLine($"Error loading module {module.Name}: Could not create instance");
continue;

30
DiscordBotCore/Loaders/PluginLoader.cs
View File

@@ -26,9 +26,9 @@ public class PluginLoader
public SlashCommandLoaded? OnSlashCommandLoaded;
public ActionLoaded? OnActionLoaded;
public static List<DBCommand> Commands { get; private set; } = new List<DBCommand>();
public static List<DBEvent> Events { get; private set; } = new List<DBEvent>();
public static List<DBSlashCommand> SlashCommands { get; private set; } = new List<DBSlashCommand>();
public static List<IDbCommand> Commands { get; private set; } = new List<IDbCommand>();
public static List<IDbEvent> Events { get; private set; } = new List<IDbEvent>();
public static List<IDbSlashCommand> SlashCommands { get; private set; } = new List<IDbSlashCommand>();
public static List<ICommandAction> Actions { get; private set; } = new List<ICommandAction>();
public PluginLoader(DiscordSocketClient discordSocketClient)
@@ -41,7 +41,7 @@ public class PluginLoader
if (_Client == null)
{
Application.CurrentApplication.Logger.Log("Discord client is null", this, LogType.Error);
Application.Logger.Log("Discord client is null", this, LogType.Error);
return;
}
@@ -50,7 +50,7 @@ public class PluginLoader
SlashCommands.Clear();
Actions.Clear();
Application.CurrentApplication.Logger.Log("Loading plugins...", this);
Application.Logger.Log("Loading plugins...", this);
var loader = new Loader();
@@ -62,7 +62,7 @@ public class PluginLoader
private void FileLoadedException(FileLoaderResult result)
{
Application.CurrentApplication.Logger.Log(result.ErrorMessage, this, LogType.Error);
Application.Logger.Log(result.ErrorMessage, this, LogType.Error);
}
private async void OnPluginLoaded(PluginLoadResultData result)
@@ -81,31 +81,31 @@ public class PluginLoader
break;
case PluginType.COMMAND:
Commands.Add((DBCommand)result.Plugin);
Commands.Add((IDbCommand)result.Plugin);
OnCommandLoaded?.Invoke(result);
break;
case PluginType.EVENT:
if (this.TryStartEvent((DBEvent)result.Plugin))
if (this.TryStartEvent((IDbEvent)result.Plugin))
{
Events.Add((DBEvent)result.Plugin);
Events.Add((IDbEvent)result.Plugin);
OnEventLoaded?.Invoke(result);
}
break;
case PluginType.SLASH_COMMAND:
if (await this.TryStartSlashCommand((DBSlashCommand)result.Plugin))
if (await this.TryStartSlashCommand((IDbSlashCommand)result.Plugin))
{
if(((DBSlashCommand)result.Plugin).HasInteraction)
_Client.InteractionCreated += ((DBSlashCommand)result.Plugin).ExecuteInteraction;
SlashCommands.Add((DBSlashCommand)result.Plugin);
if(((IDbSlashCommand)result.Plugin).HasInteraction)
_Client.InteractionCreated += ((IDbSlashCommand)result.Plugin).ExecuteInteraction;
SlashCommands.Add((IDbSlashCommand)result.Plugin);
OnSlashCommandLoaded?.Invoke(result);
}
else
Application.CurrentApplication.Logger.Log($"Failed to start slash command {result.PluginName}", this, LogType.Error);
Application.Logger.Log($"Failed to start slash command {result.PluginName}", this, LogType.Error);
break;
case PluginType.UNKNOWN:
default:
Application.CurrentApplication.Logger.Log("Unknown plugin type", this, LogType.Error);
Application.Logger.Log("Unknown plugin type", this, LogType.Error);
break;
}
}

16
DiscordBotCore/Loaders/PluginLoaderExtensions.cs
View File

@@ -14,7 +14,7 @@ namespace DiscordBotCore.Loaders;
internal static class PluginLoaderExtensions
{
internal static bool TryStartEvent(this PluginLoader pluginLoader, DBEvent? dbEvent)
internal static bool TryStartEvent(this PluginLoader pluginLoader, IDbEvent? dbEvent)
{
try
{
@@ -28,13 +28,13 @@ internal static class PluginLoaderExtensions
}
catch (Exception e)
{
Application.CurrentApplication.Logger.Log($"Error starting event {dbEvent.Name}: {e.Message}", typeof(PluginLoader), LogType.Error);
Application.CurrentApplication.Logger.LogException(e, typeof(PluginLoader));
Application.Logger.Log($"Error starting event {dbEvent.Name}: {e.Message}", typeof(PluginLoader), LogType.Error);
Application.Logger.LogException(e, typeof(PluginLoader));
return false;
}
}
internal static async Task<bool> TryStartSlashCommand(this PluginLoader pluginLoader, DBSlashCommand? dbSlashCommand)
internal static async Task<bool> TryStartSlashCommand(this PluginLoader pluginLoader, IDbSlashCommand? dbSlashCommand)
{
try
{
@@ -53,7 +53,7 @@ internal static class PluginLoaderExtensions
builder.WithDescription(dbSlashCommand.Description);
builder.Options = dbSlashCommand.Options;
if (dbSlashCommand.canUseDM)
if (dbSlashCommand.CanUseDm)
builder.WithContextTypes(InteractionContextType.BotDm, InteractionContextType.Guild);
else
builder.WithContextTypes(InteractionContextType.Guild);
@@ -64,7 +64,7 @@ internal static class PluginLoaderExtensions
if (!result)
{
Application.CurrentApplication.Logger.Log($"Failed to enable slash command {dbSlashCommand.Name} for guild {guildId}", typeof(PluginLoader), LogType.Error);
Application.Logger.Log($"Failed to enable slash command {dbSlashCommand.Name} for guild {guildId}", typeof(PluginLoader), LogType.Error);
}
}
@@ -74,7 +74,7 @@ internal static class PluginLoaderExtensions
}
catch (Exception e)
{
Application.CurrentApplication.Logger.Log($"Error starting slash command {dbSlashCommand.Name}: {e.Message}", typeof(PluginLoader), LogType.Error);
Application.Logger.Log($"Error starting slash command {dbSlashCommand.Name}: {e.Message}", typeof(PluginLoader), LogType.Error);
return false;
}
}
@@ -84,7 +84,7 @@ internal static class PluginLoaderExtensions
SocketGuild? guild = pluginLoader._Client.GetGuild(guildId);
if (guild is null)
{
Application.CurrentApplication.Logger.Log("Failed to get guild with ID " + guildId, typeof(PluginLoader), LogType.Error);
Application.Logger.Log("Failed to get guild with ID " + guildId, typeof(PluginLoader), LogType.Error);
return false;
}