Noi/RegexBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from NoiTheCat/loading-fixes

Browse source 
Fixes a major issue that prevents external assemblies from loading.
And a minor improvement to certain error messages.
This commit is contained in:
Noi 2022-10-13 11:49:18 -07:00 committed by GitHub
commit 0ee43d46b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ModuleLoader.cs
View file

@ -17,7 +17,7 @@ static class ModuleLoader {
foreach (var file in conf.Assemblies) { foreach (var file in conf.Assemblies) {
Assembly? a = null; Assembly? a = null;
try { try {
a = Assembly.LoadFile(path + file); a = Assembly.LoadFrom(path + file);
} catch (Exception ex) { } catch (Exception ex) {
Console.WriteLine("An error occurred when attempting to load a module assembly."); Console.WriteLine("An error occurred when attempting to load a module assembly.");
Console.WriteLine($"File: {file}"); Console.WriteLine($"File: {file}");

9
Services/ModuleState/ModuleStateService.cs
View file

@ -86,13 +86,10 @@ class ModuleStateService : Service {
var state = await module.CreateGuildStateAsync(guild.Id, guildConf[module.Name]!); var state = await module.CreateGuildStateAsync(guild.Id, guildConf[module.Name]!);
newStates.Add(t, state); newStates.Add(t, state);
} catch (ModuleLoadException ex) { } catch (ModuleLoadException ex) {
Log($"{guild.Id}: Error reading configuration regarding {module.Name}: {ex.Message}"); Log($"{module.Name} failed to read configuration for {guild.Name}: {ex.Message}");
return false; return false;
} catch (Exception ex) when (ex is not ModuleLoadException) { } catch (Exception ex) {
Log("Unhandled exception while initializing guild state for module:\n" + Log($"Unhandled exception from {module.Name} while creating guild state for {guild.Name}:\n{ex}");
$"Module: {module.Name} | " +
$"Guild: {guild.Id} ({BotClient.DiscordClient.GetGuild(guild.Id)?.Name ?? "unknown name"})\n" +
$"```\n{ex}\n```");
return false; return false;
} }
} }