diff --git a/ConfigItem/EntityList.cs b/ConfigItem/EntityList.cs index a8af63a..22459ad 100644 --- a/ConfigItem/EntityList.cs +++ b/ConfigItem/EntityList.cs @@ -75,7 +75,7 @@ namespace Noikoio.RegexBot.ConfigItem if (section["blacklist"] != null) { if (mode == FilterType.Whitelist) - throw new RuleConfig.RuleImportException("Cannot have whitelist AND blacklist defined."); + throw new RuleImportException("Cannot have whitelist AND blacklist defined."); mode = FilterType.Blacklist; } if (mode == FilterType.None) list = new EntityList(); // might even be fine to keep it null? diff --git a/ConfigItem/RuleImportException.cs b/ConfigItem/RuleImportException.cs new file mode 100644 index 0000000..5e1e32f --- /dev/null +++ b/ConfigItem/RuleImportException.cs @@ -0,0 +1,12 @@ +using System; + +namespace Noikoio.RegexBot.ConfigItem +{ + /// + /// Exception thrown during an attempt to read rule configuration. + /// + public class RuleImportException : Exception + { + public RuleImportException(string message) : base(message) { } + } +} diff --git a/ConfigLoader.cs b/ConfigLoader.cs index 98c5fc5..f9b286d 100644 --- a/ConfigLoader.cs +++ b/ConfigLoader.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Noikoio.RegexBot.ConfigItem; +using Noikoio.RegexBot.Feature.RegexResponder; using System; using System.Collections.Generic; using System.IO; @@ -165,7 +166,7 @@ namespace Noikoio.RegexBot try { rule = new RuleConfig(newserver, ruleconf); - } catch (RuleConfig.RuleImportException ex) + } catch (RuleImportException ex) { await SLog("-> Error: " + ex.Message); return false; diff --git a/Feature/RegexResponder/Responses.cs b/Feature/RegexResponder/Responses.cs index d2d0c85..8710702 100644 --- a/Feature/RegexResponder/Responses.cs +++ b/Feature/RegexResponder/Responses.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace Noikoio.RegexBot.Feature.RegexResponder { // Contains code for handling each response in a rule. - partial class RegexResponder + partial class EventProcessor { private delegate Task ResponseProcessor(AsyncLogger l, string cmd, RuleConfig r, SocketMessage m); private readonly ReadOnlyDictionary _commands; diff --git a/Feature/RegexResponder/RuleConfig.cs b/Feature/RegexResponder/RuleConfig.cs index 93113f4..b626bba 100644 --- a/Feature/RegexResponder/RuleConfig.cs +++ b/Feature/RegexResponder/RuleConfig.cs @@ -147,15 +147,5 @@ namespace Noikoio.RegexBot.Feature.RegexResponder bool? embedmode = ruleconf["MatchEmbeds"]?.Value(); _matchEmbeds = (embedmode.HasValue && embedmode == true); } - - /// - /// Exception thrown during an attempt to read rule configuration. - /// - public class RuleImportException : Exception - { - public RuleImportException(string message) : base(message) { } - } } - - }