Updated a few things in the Marmalade system

src/Ellie.Marmalade/Attributes/FilterAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Overridden to implement custom checks which commands have to pass in order to be executed.

src/Ellie.Marmalade/Attributes/MarmaladePermAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Used as a marker class for bot_perm and user_perm Attributes

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

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

src/Ellie.Marmalade/Attributes/cmdAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Marks a method as a snek command

src/Ellie.Marmalade/Attributes/injectAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Marks services in command arguments for injection.

src/Ellie.Marmalade/Attributes/leftoverAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Marks the parameter to take 

src/Ellie.Marmalade/Attributes/prioAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Sets the priority of a command in case there are multiple commands with the same name but different parameters.

src/Ellie.Marmalade/Attributes/svcAttribute.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Marks the class as a service which can be used within the same Medusa

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

src/Ellie.Marmalade/Canary.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// The base class which will be loaded as a module into EllieBot

src/Ellie.Marmalade/Context/AnyContext.cs

@@ -1,7 +1,7 @@
 using Discord;
 using EllieBot;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// 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; }
 
     /// <summary>
-    /// Provides access to strings used by this medusa
+    /// Provides access to strings used by this marmalade
     /// </summary>
     public abstract IMarmaladeStrings Strings { get; }
 

src/Ellie.Marmalade/Context/DmContext.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Commands which take this type as the first parameter can only be executed in DMs

src/Ellie.Marmalade/Context/GuildContext.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Commands which take this type as a first parameter can only be executed in a server

src/Ellie.Marmalade/Ellie.Marmalade.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
-    <RootNamespace>Ellie.Canary</RootNamespace>
+    <RootNamespace>Ellie.Marmalade</RootNamespace>
   
     <Authors>The EllieBot Devs</Authors>
   </PropertyGroup>

src/Ellie.Marmalade/Extensions/MarmaladeExtensions.cs

@@ -1,5 +1,5 @@
 using Discord;
-using Ellie.Canary;
+using Ellie.Marmalade;
 
 namespace EllieBot;
 

src/Ellie.Marmalade/ParamParser/ParamParser.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 /// Overridden to implement parsers for custom types 

src/Ellie.Marmalade/ParamParser/ParseResult.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 public readonly struct ParseResult<T>
 {

src/Ellie.Marmalade/Strings/CommandStrings.cs

@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 public readonly struct CommandStrings
 {

src/Ellie.Marmalade/Strings/IMarmaladeStrings.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 ///     Defines methods to retrieve and reload marmalade strings

src/Ellie.Marmalade/Strings/IMarmaladeStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 ///     Implemented by classes which provide localized strings in their own ways

src/Ellie.Marmalade/Strings/LocalMarmaladeStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 public class LocalMarmaladeStringsProvider : IMarmaladeStringsProvider
 {

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
 {

src/Ellie.Marmalade/Strings/StringsLoader.cs

@@ -2,7 +2,7 @@
 using Serilog;
 using YamlDotNet.Serialization;
 
-namespace Ellie.Canary;
+namespace Ellie.Marmalade;
 
 /// <summary>
 ///     Loads strings from the shortcut or localizable path