Namespace changes to make them make sense

NadekoBot.sln

@@ -19,7 +19,7 @@ EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Voice", "src\ayu\NadekoBot.Voice\NadekoBot.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Voice", "src\NadekoBot.Voice\NadekoBot.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Tests", "src\NadekoBot.Tests\NadekoBot.Tests.csproj", "{DB448DD4-C97F-40E9-8BD3-F605FF1FF833}"
 EndProject

src/Nadeko.Medusa/Attributes/FilterAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Overridden to implement custom checks which commands have to pass in order to be executed.

src/Nadeko.Medusa/Attributes/MedusaPermAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Used as a marker class for bot_perm and user_perm Attributes

src/Nadeko.Medusa/Attributes/bot_owner_onlyAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class bot_owner_onlyAttribute : MedusaPermAttribute

src/Nadeko.Medusa/Attributes/bot_permAttribute.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public sealed class bot_permAttribute : MedusaPermAttribute

src/Nadeko.Medusa/Attributes/cmdAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Marks a method as a snek command

src/Nadeko.Medusa/Attributes/injectAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Marks services in command arguments for injection.

src/Nadeko.Medusa/Attributes/leftoverAttribute.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Marks the parameter to take 

src/Nadeko.Medusa/Attributes/prioAttribute.cs

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

src/Nadeko.Medusa/Attributes/svcAttribute.cs

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

src/Nadeko.Medusa/Attributes/user_permAttribute.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public sealed class user_permAttribute : MedusaPermAttribute

src/Nadeko.Medusa/Context/AnyContext.cs

@@ -1,7 +1,7 @@
 using Discord;
 using NadekoBot;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Commands which take this class as a first parameter can be executed in both DMs and Servers 

src/Nadeko.Medusa/Context/DmContext.cs

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

src/Nadeko.Medusa/Context/GuildContext.cs

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

src/Nadeko.Medusa/Extensions/EmbedBuilderExtensions.cs

@@ -1,4 +1,4 @@
-namespace NadekoBot;
+namespace NadekoBot.Medusa;
 
 public static class EmbedBuilderExtensions
 {

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

@@ -1,7 +1,6 @@
 using Discord;
-using Nadeko.Snake;
 
-namespace NadekoBot;
+namespace NadekoBot.Medusa;
 
 public static class MedusaExtensions
 {

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -15,6 +15,6 @@
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Version)' == '' ">
-        <Version>6.0.0</Version>
+        <Version>9.0.0</Version>
     </PropertyGroup>
 </Project>

src/Nadeko.Medusa/ParamParser/ParamParser.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Overridden to implement parsers for custom types 

src/Nadeko.Medusa/ParamParser/ParseResult.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 public readonly struct ParseResult<T>
 {

src/Nadeko.Medusa/Snek.cs

@@ -1,6 +1,6 @@
 using Discord;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// The base class which will be loaded as a module into NadekoBot

src/Nadeko.Medusa/Strings/CommandStrings.cs

@@ -1,6 +1,6 @@
 using YamlDotNet.Serialization;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 public readonly struct CommandStrings
 {

src/Nadeko.Medusa/Strings/IMedusaStrings.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 ///     Defines methods to retrieve and reload medusa strings

src/Nadeko.Medusa/Strings/IMedusaStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 ///     Implemented by classes which provide localized strings in their own ways

src/Nadeko.Medusa/Strings/LocalMedusaStringsProvider.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 public class LocalMedusaStringsProvider : IMedusaStringsProvider
 {

src/Nadeko.Medusa/Strings/MedusaStrings.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 using Serilog;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 public class MedusaStrings : IMedusaStrings
 {

src/Nadeko.Medusa/Strings/StringsLoader.cs

@@ -2,7 +2,7 @@
 using Serilog;
 using YamlDotNet.Serialization;
 
-namespace Nadeko.Snake;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 ///     Loads strings from the shortcut or localizable path

src/NadekoBot/GlobalUsings.cs

@@ -12,7 +12,6 @@ global using Nadeko.Common; // new project
 global using NadekoBot.Common; // old + nadekobot specific things
 global using NadekoBot.Common.Attributes;
 global using NadekoBot.Extensions;
-// global using Nadeko.Snake;
 
 // discord
 global using Discord;

src/NadekoBot/Modules/Searches/Crypto/CryptoService.cs

@@ -118,7 +118,7 @@ public class CryptoService : INService
 
         var nearest = cryptos
                       .Select(elem => (Elem: elem,
-                          Distance: StringExtensions.LevenshteinDistance(elem.Name.ToUpperInvariant(), name)))
+                          Distance: elem.Name.ToUpperInvariant().LevenshteinDistance(name)))
                       .OrderBy(x => x.Distance)
                       .FirstOrDefault(x => x.Distance <= 2);
 

src/NadekoBot/Modules/Searches/Crypto/Drawing/ImagesharpStockChartDrawingService.cs

@@ -94,8 +94,7 @@ public sealed class ImagesharpStockChartDrawingService : IStockChartDrawingServi
         => image.Mutate(ctx =>
         {
             foreach (var data in drawData)
-                DrawLineExtensions.DrawLines(ctx,
-                    data.IsGreen
+                ctx.DrawLines(data.IsGreen
                         ? _greenBrush
                         : _redBrush,
                     1,
@@ -104,8 +103,7 @@ public sealed class ImagesharpStockChartDrawingService : IStockChartDrawingServi
 
 
             foreach (var data in drawData)
-                FillRectangleExtensions.Fill(ctx,
-                    data.IsGreen
+                ctx.Fill(data.IsGreen
                         ? _greenBrush
                         : _redBrush,
                     data.BodyRect);

src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs

@@ -3,6 +3,7 @@ using Humanizer.Localisation;
 using NadekoBot.Db;
 using NadekoBot.Modules.Utility.Services;
 using NadekoBot.Db.Models;
+using System.Resources;
 
 namespace NadekoBot.Modules.Utility;
 
@@ -43,7 +44,7 @@ public partial class Utility
                 await ReplyErrorLocalizedAsync(strs.remind_invalid);
                 return;
             }
-
+            
             ulong target;
             target = meorhere == MeOrHere.Me ? ctx.User.Id : ctx.Channel.Id;
             if (!await RemindInternal(target,

src/NadekoBot/NadekoBot.csproj

@@ -5,7 +5,6 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <Version>5.0.0</Version>
-        <VersionSuffix>beta1</VersionSuffix>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -76,7 +75,7 @@
         <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
         <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
         <PackageReference Include="YamlDotNet" Version="15.1.2" />
-        <PackageReference Include="SharpToken" Version="1.2.14" />
+        <PackageReference Include="SharpToken" Version="2.0.2" />
 
         <PackageReference Include="Humanizer" Version="2.14.1">
             <PrivateAssets>all</PrivateAssets>
@@ -110,9 +109,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\ayu\NadekoBot.Voice\NadekoBot.Voice.csproj" />
         <ProjectReference Include="..\Nadeko.Medusa\Nadeko.Medusa.csproj" />
-
+        <ProjectReference Include="..\NadekoBot.Voice\NadekoBot.Voice.csproj" />
         <ProjectReference Include="..\NadekoBot.Generators\NadekoBot.Generators.csproj" OutputItemType="Analyzer" />
     </ItemGroup>
     <ItemGroup>
@@ -133,16 +131,6 @@
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
     </ItemGroup>
-    <ItemGroup>
-      <Folder Include="data\medusae\" />
-      <Folder Include="_common\Extensions\" />
-    </ItemGroup>
-
-<!--    <PropertyGroup Condition=" '$(Version)' == '' ">-->
-<!--        <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">5.0.0</VersionPrefix>-->
-<!--        <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>-->
-<!--        <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>-->
-<!--    </PropertyGroup>-->
 
     <PropertyGroup Condition=" '$(Configuration)' == 'GlobalNadeko' ">
         <!-- Define trace doesn't seem to affect the build at all so I had to remove $(DefineConstants)-->

src/NadekoBot/Program.cs

@@ -1,3 +1,6 @@
+using Humanizer.Localisation;
+using System.Resources;
+
 var pid = Environment.ProcessId;
 
 var shardId = 0;

src/NadekoBot/Services/Impl/PubSub/YamlSeria.cs

@@ -28,7 +28,7 @@ public class YamlSeria : IConfigSeria
             me =>
             {
                 var str = me.Groups["code"].Value;
-                var newString = YamlHelper.UnescapeUnicodeCodePoint(str);
+                var newString = str.UnescapeUnicodeCodePoint();
                 return newString;
             });
         return output;

src/NadekoBot/_common/Abstractions/Extensions/StringExtensions.cs

@@ -131,7 +131,7 @@ public static class StringExtensions
             me =>
             {
                 var str = me.Groups["code"].Value;
-                var newString = YamlHelper.UnescapeUnicodeCodePoint(str);
+                var newString = str.UnescapeUnicodeCodePoint();
                 return newString;
             });
 }

src/NadekoBot/_common/Medusa/Common/Adapters/BehaviorAdapter.cs

@@ -1,6 +1,4 @@
-#nullable enable
-
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 [DIIgnore]
 public sealed class BehaviorAdapter : ICustomBehavior

src/NadekoBot/_common/Medusa/Common/Adapters/ContextAdapterFactory.cs

@@ -1,4 +1,4 @@
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 internal class ContextAdapterFactory
 {

src/NadekoBot/_common/Medusa/Common/Adapters/DmContextAdapter.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 public sealed class DmContextAdapter : DmContext
 {

src/NadekoBot/_common/Medusa/Common/Adapters/FilterAdapter.cs

@@ -1,4 +1,4 @@
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 namespace Nadeko.Medusa.Adapters;
 

src/NadekoBot/_common/Medusa/Common/Adapters/GuildContextAdapter.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 public sealed class GuildContextAdapter : GuildContext
 {

src/NadekoBot/_common/Medusa/Common/Adapters/ParamParserAdapter.cs

@@ -1,4 +1,4 @@
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 
 public sealed class ParamParserAdapter<T> : TypeReader
 {

src/NadekoBot/_common/Medusa/Common/CommandContextType.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 /// <summary>
 /// Enum specifying in which context the command can be executed

src/NadekoBot/_common/Medusa/Common/Config/IMedusaConfigService.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public interface IMedusaConfigService
 {

src/NadekoBot/_common/Medusa/Common/Config/MedusaConfig.cs

@@ -2,7 +2,7 @@
 using Cloneable;
 using NadekoBot.Common.Yml;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 [Cloneable]
 public sealed partial class MedusaConfig : ICloneable<MedusaConfig>

src/NadekoBot/_common/Medusa/Common/Config/MedusaConfigService.cs

@@ -1,6 +1,6 @@
 using NadekoBot.Common.Configs;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedusaConfigService
 {

src/NadekoBot/_common/Medusa/Common/MedusaAssemblyLoadContext.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.Loader;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public class MedusaAssemblyLoadContext : AssemblyLoadContext
 {

src/NadekoBot/_common/Medusa/Common/MedusaIoCKernelModule.cs

@@ -1,5 +1,4 @@
-using Nadeko.Snake;
-using System.Reflection;
+using System.Reflection;
 using Ninject;
 using Ninject.Activation;
 using Ninject.Activation.Caching;
@@ -7,7 +6,7 @@ using Ninject.Modules;
 using Ninject.Planning;
 using System.Text.Json;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed class MedusaNinjectModule : NinjectModule
 {

src/NadekoBot/_common/Medusa/Common/MedusaLoaderService.cs

@@ -10,9 +10,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Nadeko.Snake;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 // ReSharper disable RedundantAssignment
 public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor, INService

src/NadekoBot/_common/Medusa/Common/Models/ParamData.cs

@@ -1,4 +1,4 @@
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed record ParamData(
     Type Type,

src/NadekoBot/_common/Medusa/Common/Models/ResolvedMedusa.cs

@@ -1,8 +1,8 @@
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 using Ninject.Modules;
 using System.Collections.Immutable;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed record ResolvedMedusa(
     WeakReference<MedusaAssemblyLoadContext> LoadContext,

src/NadekoBot/_common/Medusa/Common/Models/SnekCommandData.cs

@@ -1,8 +1,7 @@
-using Nadeko.Snake;
+using NadekoBot.Medusa;
 using System.Reflection;
-using CommandStrings = Nadeko.Snake.CommandStrings;
 
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed class SnekCommandData
 {

src/NadekoBot/_common/Medusa/Common/Models/SnekData.cs

@@ -1,6 +1,4 @@
-using Nadeko.Snake;
-
-namespace Nadeko.Medusa;
+namespace NadekoBot.Medusa;
 
 public sealed record SnekInfo(
     string Name,

src/NadekoBot/_common/NadekoModule.cs

@@ -86,7 +86,7 @@ public abstract class NadekoModule : ModuleBase
         embed.WithPendingColor()
             .WithFooter("yes/no");
 
-        var msg = await MessageChannelExtensions.EmbedAsync(ctx.Channel, embed);
+        var msg = await ctx.Channel.EmbedAsync(embed);
         try
         {
             var input = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);