diff --git a/Modules/AutoResponder/AutoResponder.cs b/Modules/AutoResponder/AutoResponder.cs index 96a8d58..64b5d70 100644 --- a/Modules/AutoResponder/AutoResponder.cs +++ b/Modules/AutoResponder/AutoResponder.cs @@ -12,7 +12,7 @@ internal class AutoResponder : RegexbotModule { DiscordClient.MessageReceived += DiscordClient_MessageReceived; } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); var defs = new List(); diff --git a/Modules/EntryRole/EntryRole.cs b/Modules/EntryRole/EntryRole.cs index 0042099..74b4440 100644 --- a/Modules/EntryRole/EntryRole.cs +++ b/Modules/EntryRole/EntryRole.cs @@ -52,7 +52,7 @@ internal sealed class EntryRole : RegexbotModule, IDisposable { return Task.CompletedTask; } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); if (config.Type != JTokenType.Object) diff --git a/Modules/ModCommands/ModCommands.cs b/Modules/ModCommands/ModCommands.cs index d9575ce..25cb3cf 100644 --- a/Modules/ModCommands/ModCommands.cs +++ b/Modules/ModCommands/ModCommands.cs @@ -15,7 +15,7 @@ internal class ModCommands : RegexbotModule { } } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); var conf = new ModuleConfig(this, config); diff --git a/Modules/ModLogs/ModLogs.cs b/Modules/ModLogs/ModLogs.cs index 5eb3a0d..7c3d5eb 100644 --- a/Modules/ModLogs/ModLogs.cs +++ b/Modules/ModLogs/ModLogs.cs @@ -15,7 +15,7 @@ internal partial class ModLogs : RegexbotModule { bot.SharedEventReceived += HandleReceivedSharedEvent; } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); if (config.Type != JTokenType.Object) throw new ModuleLoadException("Configuration for this section is invalid."); diff --git a/Modules/PendingOutRole/PendingOutRole.cs b/Modules/PendingOutRole/PendingOutRole.cs index f02db71..f2b019f 100644 --- a/Modules/PendingOutRole/PendingOutRole.cs +++ b/Modules/PendingOutRole/PendingOutRole.cs @@ -41,7 +41,7 @@ internal class PendingOutRole : RegexbotModule { } } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); if (config.Type != JTokenType.Object) throw new ModuleLoadException("Configuration for this section is invalid."); diff --git a/Modules/RegexModerator/RegexModerator.cs b/Modules/RegexModerator/RegexModerator.cs index 7239390..24de7d8 100644 --- a/Modules/RegexModerator/RegexModerator.cs +++ b/Modules/RegexModerator/RegexModerator.cs @@ -12,7 +12,7 @@ internal class RegexModerator : RegexbotModule { DiscordClient.MessageUpdated += DiscordClient_MessageUpdated; } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); var defs = new List(); diff --git a/Modules/VoiceRoleSync/VoiceRoleSync.cs b/Modules/VoiceRoleSync/VoiceRoleSync.cs index b7c675f..196573f 100644 --- a/Modules/VoiceRoleSync/VoiceRoleSync.cs +++ b/Modules/VoiceRoleSync/VoiceRoleSync.cs @@ -43,7 +43,7 @@ internal class VoiceRoleSync : RegexbotModule { } } - public override Task CreateGuildStateAsync(ulong guildID, JToken config) { + public override Task CreateGuildStateAsync(ulong guildID, JToken? config) { if (config == null) return Task.FromResult(null); if (config.Type != JTokenType.Object) throw new ModuleLoadException("Configuration for this section is invalid."); diff --git a/RegexbotModule.cs b/RegexbotModule.cs index 033817b..ca84ada 100644 --- a/RegexbotModule.cs +++ b/RegexbotModule.cs @@ -43,7 +43,7 @@ public abstract class RegexbotModule { /// /// An object instance containing state and/or configuration information for the guild currently being processed. /// - public abstract Task CreateGuildStateAsync(ulong guildID, JToken config); + public abstract Task CreateGuildStateAsync(ulong guildID, JToken? config); /// /// Retrieves the state object that corresponds with the given guild. diff --git a/Services/ModuleState/ModuleStateService.cs b/Services/ModuleState/ModuleStateService.cs index e2592f6..ecaf395 100644 --- a/Services/ModuleState/ModuleStateService.cs +++ b/Services/ModuleState/ModuleStateService.cs @@ -76,7 +76,7 @@ class ModuleStateService : Service { foreach (var module in BotClient.Modules) { var t = module.GetType(); try { - var state = await module.CreateGuildStateAsync(guild.Id, guildConf[module.Name]!); + var state = await module.CreateGuildStateAsync(guild.Id, guildConf[module.Name]); newStates.Add(t, state); } catch (ModuleLoadException ex) { Log($"{module.Name} failed to read configuration for {guild.Name}: {ex.Message}");