From daa71f812e99f3237063933d5fff7412bf82fe01 Mon Sep 17 00:00:00 2001 From: Toastie Date: Fri, 29 Mar 2024 01:01:35 +1300 Subject: [PATCH] Updated a few things in the Marmalade system --- src/Ellie.Marmalade/Attributes/FilterAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/bot_owner_onlyAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/bot_permAttribute.cs | 4 ++-- src/Ellie.Marmalade/Attributes/cmdAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/injectAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/leftoverAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/prioAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/svcAttribute.cs | 2 +- src/Ellie.Marmalade/Attributes/user_permAttribute.cs | 2 +- src/Ellie.Marmalade/Canary.cs | 2 +- src/Ellie.Marmalade/Context/AnyContext.cs | 4 ++-- src/Ellie.Marmalade/Context/DmContext.cs | 2 +- src/Ellie.Marmalade/Context/GuildContext.cs | 2 +- src/Ellie.Marmalade/Ellie.Marmalade.csproj | 2 +- src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs | 2 +- src/Ellie.Marmalade/ParamParser/ParamParser.cs | 2 +- src/Ellie.Marmalade/ParamParser/ParseResult.cs | 2 +- src/Ellie.Marmalade/Strings/CommandStrings.cs | 2 +- src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs | 2 +- src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs | 2 +- src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs | 2 +- src/Ellie.Marmalade/Strings/MarmaladeStrings.cs | 2 +- src/Ellie.Marmalade/Strings/StringsLoader.cs | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Ellie.Marmalade/Attributes/FilterAttribute.cs b/src/Ellie.Marmalade/Attributes/FilterAttribute.cs index 1f2858e..de6ae24 100644 --- a/src/Ellie.Marmalade/Attributes/FilterAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/FilterAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Overridden to implement custom checks which commands have to pass in order to be executed. diff --git a/src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs b/src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs index 0e7003c..0001d76 100644 --- a/src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Used as a marker class for bot_perm and user_perm Attributes diff --git a/src/Ellie.Marmalade/Attributes/bot_owner_onlyAttribute.cs b/src/Ellie.Marmalade/Attributes/bot_owner_onlyAttribute.cs index cbffa6c..8186614 100644 --- a/src/Ellie.Marmalade/Attributes/bot_owner_onlyAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/bot_owner_onlyAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; [AttributeUsage(AttributeTargets.Method)] public sealed class bot_owner_onlyAttribute : MarmaladePermAttribute diff --git a/src/Ellie.Marmalade/Attributes/bot_permAttribute.cs b/src/Ellie.Marmalade/Attributes/bot_permAttribute.cs index faaede2..30fa320 100644 --- a/src/Ellie.Marmalade/Attributes/bot_permAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/bot_permAttribute.cs @@ -1,6 +1,6 @@ using Discord; -namespace Ellie.Canary; +namespace Ellie.Marmalade; [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] public sealed class bot_permAttribute : MarmaladePermAttribute @@ -13,7 +13,7 @@ public sealed class bot_permAttribute : MarmaladePermAttribute GuildPerm = perm; ChannelPerm = null; } - + public bot_permAttribute(ChannelPermission perm) { ChannelPerm = perm; diff --git a/src/Ellie.Marmalade/Attributes/cmdAttribute.cs b/src/Ellie.Marmalade/Attributes/cmdAttribute.cs index f40ca2e..56ce03b 100644 --- a/src/Ellie.Marmalade/Attributes/cmdAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/cmdAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Marks a method as a snek command diff --git a/src/Ellie.Marmalade/Attributes/injectAttribute.cs b/src/Ellie.Marmalade/Attributes/injectAttribute.cs index 3380b9d..4865cff 100644 --- a/src/Ellie.Marmalade/Attributes/injectAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/injectAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Marks services in command arguments for injection. diff --git a/src/Ellie.Marmalade/Attributes/leftoverAttribute.cs b/src/Ellie.Marmalade/Attributes/leftoverAttribute.cs index d632715..b16c225 100644 --- a/src/Ellie.Marmalade/Attributes/leftoverAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/leftoverAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Marks the parameter to take diff --git a/src/Ellie.Marmalade/Attributes/prioAttribute.cs b/src/Ellie.Marmalade/Attributes/prioAttribute.cs index cf6d0d4..9b1cc81 100644 --- a/src/Ellie.Marmalade/Attributes/prioAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/prioAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Sets the priority of a command in case there are multiple commands with the same name but different parameters. diff --git a/src/Ellie.Marmalade/Attributes/svcAttribute.cs b/src/Ellie.Marmalade/Attributes/svcAttribute.cs index eb225b0..dab065f 100644 --- a/src/Ellie.Marmalade/Attributes/svcAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/svcAttribute.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Marks the class as a service which can be used within the same Medusa diff --git a/src/Ellie.Marmalade/Attributes/user_permAttribute.cs b/src/Ellie.Marmalade/Attributes/user_permAttribute.cs index a4826db..7d195eb 100644 --- a/src/Ellie.Marmalade/Attributes/user_permAttribute.cs +++ b/src/Ellie.Marmalade/Attributes/user_permAttribute.cs @@ -1,6 +1,6 @@ using Discord; -namespace Ellie.Canary; +namespace Ellie.Marmalade; [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] public sealed class user_permAttribute : MarmaladePermAttribute diff --git a/src/Ellie.Marmalade/Canary.cs b/src/Ellie.Marmalade/Canary.cs index 64a9c4c..6fef82c 100644 --- a/src/Ellie.Marmalade/Canary.cs +++ b/src/Ellie.Marmalade/Canary.cs @@ -1,6 +1,6 @@ using Discord; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// The base class which will be loaded as a module into EllieBot diff --git a/src/Ellie.Marmalade/Context/AnyContext.cs b/src/Ellie.Marmalade/Context/AnyContext.cs index f333f1e..816a95d 100644 --- a/src/Ellie.Marmalade/Context/AnyContext.cs +++ b/src/Ellie.Marmalade/Context/AnyContext.cs @@ -1,7 +1,7 @@ using Discord; using EllieBot; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Commands which take this class as a first parameter can be executed in both DMs and Servers @@ -29,7 +29,7 @@ public abstract class AnyContext public abstract ISelfUser Bot { get; } /// - /// Provides access to strings used by this medusa + /// Provides access to strings used by this marmalade /// public abstract IMarmaladeStrings Strings { get; } diff --git a/src/Ellie.Marmalade/Context/DmContext.cs b/src/Ellie.Marmalade/Context/DmContext.cs index 3810984..a703fa4 100644 --- a/src/Ellie.Marmalade/Context/DmContext.cs +++ b/src/Ellie.Marmalade/Context/DmContext.cs @@ -1,6 +1,6 @@ using Discord; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Commands which take this type as the first parameter can only be executed in DMs diff --git a/src/Ellie.Marmalade/Context/GuildContext.cs b/src/Ellie.Marmalade/Context/GuildContext.cs index 916f945..33cca4f 100644 --- a/src/Ellie.Marmalade/Context/GuildContext.cs +++ b/src/Ellie.Marmalade/Context/GuildContext.cs @@ -1,6 +1,6 @@ using Discord; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Commands which take this type as a first parameter can only be executed in a server diff --git a/src/Ellie.Marmalade/Ellie.Marmalade.csproj b/src/Ellie.Marmalade/Ellie.Marmalade.csproj index d296490..aa15438 100644 --- a/src/Ellie.Marmalade/Ellie.Marmalade.csproj +++ b/src/Ellie.Marmalade/Ellie.Marmalade.csproj @@ -6,7 +6,7 @@ enable preview true - Ellie.Canary + Ellie.Marmalade The EllieBot Devs diff --git a/src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs b/src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs index c72859f..c02f973 100644 --- a/src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs +++ b/src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs @@ -1,5 +1,5 @@ using Discord; -using Ellie.Canary; +using Ellie.Marmalade; namespace EllieBot; diff --git a/src/Ellie.Marmalade/ParamParser/ParamParser.cs b/src/Ellie.Marmalade/ParamParser/ParamParser.cs index feec7d1..a174a78 100644 --- a/src/Ellie.Marmalade/ParamParser/ParamParser.cs +++ b/src/Ellie.Marmalade/ParamParser/ParamParser.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Overridden to implement parsers for custom types diff --git a/src/Ellie.Marmalade/ParamParser/ParseResult.cs b/src/Ellie.Marmalade/ParamParser/ParseResult.cs index 81a8607..e12b77e 100644 --- a/src/Ellie.Marmalade/ParamParser/ParseResult.cs +++ b/src/Ellie.Marmalade/ParamParser/ParseResult.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; public readonly struct ParseResult { diff --git a/src/Ellie.Marmalade/Strings/CommandStrings.cs b/src/Ellie.Marmalade/Strings/CommandStrings.cs index 8328fae..5d06f3c 100644 --- a/src/Ellie.Marmalade/Strings/CommandStrings.cs +++ b/src/Ellie.Marmalade/Strings/CommandStrings.cs @@ -1,6 +1,6 @@ using YamlDotNet.Serialization; -namespace Ellie.Canary; +namespace Ellie.Marmalade; public readonly struct CommandStrings { diff --git a/src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs b/src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs index 1527bfe..37c4299 100644 --- a/src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs +++ b/src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Defines methods to retrieve and reload marmalade strings diff --git a/src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs b/src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs index d2fb1a7..6df86b0 100644 --- a/src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs +++ b/src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Implemented by classes which provide localized strings in their own ways diff --git a/src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs b/src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs index 2bb6ca6..0ea98d5 100644 --- a/src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs +++ b/src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs @@ -1,4 +1,4 @@ -namespace Ellie.Canary; +namespace Ellie.Marmalade; public class LocalMarmaladeStringsProvider : IMarmaladeStringsProvider { diff --git a/src/Ellie.Marmalade/Strings/MarmaladeStrings.cs b/src/Ellie.Marmalade/Strings/MarmaladeStrings.cs index 2880764..286e9a1 100644 --- a/src/Ellie.Marmalade/Strings/MarmaladeStrings.cs +++ b/src/Ellie.Marmalade/Strings/MarmaladeStrings.cs @@ -1,7 +1,7 @@ using System.Globalization; using Serilog; -namespace Ellie.Canary; +namespace Ellie.Marmalade; public class MarmaladeStrings : IMarmaladeStrings { diff --git a/src/Ellie.Marmalade/Strings/StringsLoader.cs b/src/Ellie.Marmalade/Strings/StringsLoader.cs index bec5c17..986fcad 100644 --- a/src/Ellie.Marmalade/Strings/StringsLoader.cs +++ b/src/Ellie.Marmalade/Strings/StringsLoader.cs @@ -2,7 +2,7 @@ using Serilog; using YamlDotNet.Serialization; -namespace Ellie.Canary; +namespace Ellie.Marmalade; /// /// Loads strings from the shortcut or localizable path