Updated some namespaces, finished some todos. v5 should be cancelled probably as the code is too intertwined to make it modular

src/NadekoBot/Bot.cs

@@ -1,6 +1,7 @@
 #nullable disable
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
+using Nadeko.Bot.Db;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
@@ -14,8 +15,8 @@ using NadekoBot.Modules.Permissions;
 using NadekoBot.Modules.Searches;
 using NadekoBot.Modules.Utility;
 using NadekoBot.Modules.Xp;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+
+using Nadeko.Bot.Db.Models;
 using Ninject;
 using Ninject.Planning;
 using System.Collections.Immutable;
@@ -34,8 +35,6 @@ public sealed class Bot : IBot
 
     private IKernel Services { get; set; }
 
-    // todo remove
-    public string Mention { get; private set; }
     public bool IsReady { get; private set; }
     public int ShardId { get; set; }
 
@@ -293,8 +292,7 @@ public sealed class Bot : IBot
         var sw = Stopwatch.StartNew();
 
         await LoginAsync(_creds.Token);
-
-        Mention = Client.CurrentUser.Mention;
+        
         Log.Information("Shard {ShardId} loading services...", Client.ShardId);
         try
         {

src/NadekoBot/Db/MysqlContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 
-namespace NadekoBot.Services.Database;
+namespace Nadeko.Bot.Db;
 
 public sealed class MysqlContext : NadekoContext
 {

src/NadekoBot/Db/NadekoContext.cs

@@ -2,11 +2,11 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
+using Nadeko.Bot.Db.Models;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace NadekoBot.Services.Database;
+namespace Nadeko.Bot.Db;
 
 public abstract class NadekoContext : DbContext
 {

src/NadekoBot/Db/NadekoDbService.cs

@@ -2,7 +2,7 @@
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database;
+namespace Nadeko.Bot.Db;
 
 public sealed class NadekoDbService : DbService 
 {

src/NadekoBot/Db/PostgreSqlContext.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database;
+namespace Nadeko.Bot.Db;
 
 public sealed class PostgreSqlContext : NadekoContext
 {

src/NadekoBot/Db/SqliteContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database;
+namespace Nadeko.Bot.Db;
 
 public sealed class SqliteContext : NadekoContext
 {

src/NadekoBot/Medusa/Adapters/ContextAdapterFactory.cs

@@ -1,4 +1,6 @@
-internal class ContextAdapterFactory
+using Nadeko.Medusa;
+
+internal class ContextAdapterFactory
 {
     public static AnyContext CreateNew(ICommandContext context, IMedusaStrings strings, IServiceProvider services)
         => context.Guild is null

src/NadekoBot/Medusa/MedusaLoaderService.cs

@@ -1,5 +1,6 @@
 using Discord.Commands.Builders;
 using Microsoft.Extensions.DependencyInjection;
+using Nadeko.Common.Medusa;
 using Nadeko.Medusa.Adapters;
 using NadekoBot.Common.ModuleBehaviors;
 using Ninject;

src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/20230813113816_timely-reminder-type.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/20230903153202_clubinfo-name-index.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs

@@ -3,7 +3,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Postgresql/20221122204423_feed-text.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/NadekoBot/Migrations/Postgresql/20230813113832_timely-reminder-type.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/NadekoBot/Migrations/Postgresql/20230903154851_clubinfo-name-index.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

@@ -3,7 +3,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable

src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Sqlite/20230813110732_timely-reminder-type.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Sqlite/20230903153230_clubinfo-name-index.Designer.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Migrations/Sqlite/SqliteContextModelSnapshot.cs

@@ -3,7 +3,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using NadekoBot.Services.Database;
+using Nadeko.Bot.Db;
 
 #nullable disable
 

src/NadekoBot/Modules/Gambling/CurrencyProvider.cs

@@ -3,7 +3,6 @@ using NadekoBot.Modules.Gambling.Services;
 
 namespace NadekoBot.Modules.Gambling;
 
-// todo do we need both currencyprovider and currencyservice
 public sealed class CurrencyProvider : ICurrencyProvider, INService
 {
     private readonly GamblingConfigService _cs;

src/NadekoBot/Modules/Medusae/Medusa.cs

@@ -1,4 +1,4 @@
-using Nadeko.Medusa;
+using Nadeko.Common.Medusa;
 
 namespace NadekoBot.Modules;
 

src/NadekoBot/NadekoBot.csproj

@@ -130,6 +130,9 @@
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
     </ItemGroup>
+    <ItemGroup>
+      <Folder Include="data\medusae\" />
+    </ItemGroup>
 
     <PropertyGroup Condition=" '$(Version)' == '' ">
         <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">5.0.0</VersionPrefix>

src/NadekoBot/PermissionChecker.cs

@@ -11,12 +11,20 @@ public sealed class PermissionChecker : IPermissionChecker, INService
     private readonly PermissionService _perms;
     private readonly GlobalPermissionService _gperm;
     private readonly CmdCdService _cmdCds;
+    private readonly IEmbedBuilderService _ebs;
+    private readonly CommandHandler _ch;
 
-    public PermissionChecker(PermissionService perms, GlobalPermissionService gperm, CmdCdService cmdCds)
+    // todo .GetPrefix should be in a different place
+    public PermissionChecker(PermissionService perms,
+        GlobalPermissionService gperm, CmdCdService cmdCds,
+        IEmbedBuilderService ebs,
+        CommandHandler ch)
     {
         _perms = perms;
         _gperm = gperm;
         _cmdCds = cmdCds;
+        _ebs = ebs;
+        _ch = ch;
     }
 
     public async Task<OneOf<Success, Error<LocStr>>> CheckAsync(
@@ -44,26 +52,29 @@ public sealed class PermissionChecker : IPermissionChecker, INService
                 return new Success();
             }
 
+            // todo check if this even works
             if (guild is SocketGuild sg)
             {
                 var pc = _perms.GetCacheFor(guild.Id);
-                if (!pc.Permissions.CheckPermissions(author, channel, cmd, "ACTUALEXPRESSIONS", out var index))
+                if (!pc.Permissions.CheckPermissions(author, channel, cmd, module, out var index))
                 {
                     if (pc.Verbose)
                     {
                         // todo fix
-                        // var permissionMessage = strs.perm_prevent(index + 1,
-                        //     Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), sg)));
-                        //
-                        // try
-                        // {
-                        //     await msg.Channel.SendErrorAsync(_eb, permissionMessage);
-                        // }
-                        // catch
-                        // {
-                        // }
-                        //
-                        // Log.Information("{PermissionMessage}", permissionMessage);
+                        var permissionMessage = strs.perm_prevent(index + 1,
+                            Format.Bold(pc.Permissions[index].GetCommand(_ch.GetPrefix(guild), sg)));
+                        
+                        try
+                        {
+                            // await channel.SendErrorAsync(_ebs,
+                            //     title: null,
+                            //     text: GettextpermissionMessage);
+                        }
+                        catch
+                        {
+                        }
+                        
+                        Log.Information("{PermissionMessage}", permissionMessage);
                     }
 
                     // todo add proper string