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

Nullable incoming module config

Browse source
This commit is contained in:
Noi 2022-10-22 17:47:23 -07:00
parent 11ac7418c6
commit 9d04d22a71
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Modules/AutoResponder/AutoResponder.cs
View file

@ -12,7 +12,7 @@ internal class AutoResponder : RegexbotModule {
DiscordClient.MessageReceived += DiscordClient_MessageReceived; DiscordClient.MessageReceived += DiscordClient_MessageReceived;
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
var defs = new List<Definition>(); var defs = new List<Definition>();

2
Modules/EntryRole/EntryRole.cs
View file

@ -52,7 +52,7 @@ internal sealed class EntryRole : RegexbotModule, IDisposable {
return Task.CompletedTask; return Task.CompletedTask;
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
if (config.Type != JTokenType.Object) if (config.Type != JTokenType.Object)

2
Modules/ModCommands/ModCommands.cs
View file

@ -15,7 +15,7 @@ internal class ModCommands : RegexbotModule {
} }
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
var conf = new ModuleConfig(this, config); var conf = new ModuleConfig(this, config);

2
Modules/ModLogs/ModLogs.cs
View file

@ -15,7 +15,7 @@ internal partial class ModLogs : RegexbotModule {
bot.SharedEventReceived += HandleReceivedSharedEvent; bot.SharedEventReceived += HandleReceivedSharedEvent;
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
if (config.Type != JTokenType.Object) if (config.Type != JTokenType.Object)
throw new ModuleLoadException("Configuration for this section is invalid."); throw new ModuleLoadException("Configuration for this section is invalid.");

2
Modules/PendingOutRole/PendingOutRole.cs
View file

@ -41,7 +41,7 @@ internal class PendingOutRole : RegexbotModule {
} }
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
if (config.Type != JTokenType.Object) if (config.Type != JTokenType.Object)
throw new ModuleLoadException("Configuration for this section is invalid."); throw new ModuleLoadException("Configuration for this section is invalid.");

2
Modules/RegexModerator/RegexModerator.cs
View file

@ -12,7 +12,7 @@ internal class RegexModerator : RegexbotModule {
DiscordClient.MessageUpdated += DiscordClient_MessageUpdated; DiscordClient.MessageUpdated += DiscordClient_MessageUpdated;
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
var defs = new List<ConfDefinition>(); var defs = new List<ConfDefinition>();

2
Modules/VoiceRoleSync/VoiceRoleSync.cs
View file

@ -43,7 +43,7 @@ internal class VoiceRoleSync : RegexbotModule {
} }
} }
public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken config) { public override Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config) {
if (config == null) return Task.FromResult<object?>(null); if (config == null) return Task.FromResult<object?>(null);
if (config.Type != JTokenType.Object) if (config.Type != JTokenType.Object)
throw new ModuleLoadException("Configuration for this section is invalid."); throw new ModuleLoadException("Configuration for this section is invalid.");

2
RegexbotModule.cs
View file

@ -43,7 +43,7 @@ public abstract class RegexbotModule {
/// <returns> /// <returns>
/// An object instance containing state and/or configuration information for the guild currently being processed. /// An object instance containing state and/or configuration information for the guild currently being processed.
/// </returns> /// </returns>
public abstract Task<object?> CreateGuildStateAsync(ulong guildID, JToken config); public abstract Task<object?> CreateGuildStateAsync(ulong guildID, JToken? config);
/// <summary> /// <summary>
/// Retrieves the state object that corresponds with the given guild. /// Retrieves the state object that corresponds with the given guild.

2
Services/ModuleState/ModuleStateService.cs
View file

@ -76,7 +76,7 @@ class ModuleStateService : Service {
foreach (var module in BotClient.Modules) { foreach (var module in BotClient.Modules) {
var t = module.GetType(); var t = module.GetType();
try { 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); newStates.Add(t, state);
} catch (ModuleLoadException ex) { } catch (ModuleLoadException ex) {
Log($"{module.Name} failed to read configuration for {guild.Name}: {ex.Message}"); Log($"{module.Name} failed to read configuration for {guild.Name}: {ex.Message}");