Fixed some aliases and reworked namespaces

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs

@@ -2,119 +2,163 @@
 using System.Globalization;
 using CsvHelper;
 using CsvHelper.Configuration;
+using NadekoBot.Modules.Gambling;
 using NadekoBot.Modules.Administration.Services;
+using NadekoBot.Modules.Xp;
 
-#if !GLOBAL_NADEKO
-namespace NadekoBot.Modules.Administration
+namespace NadekoBot.Modules.Administration;
+
+public partial class Administration
 {
-    public partial class Administration
+    [Group]
+    [OwnerOnly]
+    [NoPublicBot]
+    public partial class DangerousCommands : CleanupModuleBase
     {
-        [Group]
-        [OwnerOnly]
-        public partial class DangerousCommands : NadekoModule<DangerousCommandsService>
+        private readonly DangerousCommandsService _ds;
+        private readonly IGamblingCleanupService _gcs;
+        private readonly IXpCleanupService _xcs;
+
+        public DangerousCommands(
+            DangerousCommandsService ds,
+            IGamblingCleanupService gcs,
+            IXpCleanupService xcs)
         {
-            [Cmd]
-            [OwnerOnly]
-            public Task SqlSelect([Leftover] string sql)
+            _ds = ds;
+            _gcs = gcs;
+            _xcs = xcs;
+        }
+
+        [Cmd]
+        [OwnerOnly]
+        public Task SqlSelect([Leftover] string sql)
+        {
+            var result = _ds.SelectSql(sql);
+
+            return ctx.SendPaginatedConfirmAsync(0,
+                cur =>
+                {
+                    var items = result.Results.Skip(cur * 20).Take(20).ToList();
+
+                    if (!items.Any())
+                        return _eb.Create().WithErrorColor().WithFooter(sql).WithDescription("-");
+
+                    return _eb.Create()
+                              .WithOkColor()
+                              .WithFooter(sql)
+                              .WithTitle(string.Join(" ║ ", result.ColumnNames))
+                              .WithDescription(string.Join('\n', items.Select(x => string.Join(" ║ ", x))));
+                },
+                result.Results.Count,
+                20);
+        }
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task SqlSelectCsv([Leftover] string sql)
+        {
+            var result = _ds.SelectSql(sql);
+
+            // create a file stream and write the data as csv
+            using var ms = new MemoryStream();
+            await using var sw = new StreamWriter(ms);
+            await using var csv = new CsvWriter(sw,
+                new CsvConfiguration(CultureInfo.InvariantCulture)
+                {
+                    Delimiter = ","
+                });
+
+            foreach (var cn in result.ColumnNames)
             {
-                var result = _service.SelectSql(sql);
-
-                return ctx.SendPaginatedConfirmAsync(0,
-                    cur =>
-                    {
-                        var items = result.Results.Skip(cur * 20).Take(20).ToList();
-
-                        if (!items.Any())
-                            return _eb.Create().WithErrorColor().WithFooter(sql).WithDescription("-");
-
-                        return _eb.Create()
-                            .WithOkColor()
-                            .WithFooter(sql)
-                            .WithTitle(string.Join(" ║ ", result.ColumnNames))
-                            .WithDescription(string.Join('\n', items.Select(x => string.Join(" ║ ", x))));
-                    },
-                    result.Results.Count,
-                    20);
+                csv.WriteField(cn);
             }
 
-            [Cmd]
-            [OwnerOnly]
-            public async Task SqlSelectCsv([Leftover] string sql)
+            await csv.NextRecordAsync();
+
+            foreach (var row in result.Results)
             {
-                var result = _service.SelectSql(sql);
-
-                // create a file stream and write the data as csv
-                using var ms = new MemoryStream();
-                await using var sw = new StreamWriter(ms);
-                await using var csv = new CsvWriter(sw,
-                    new CsvConfiguration(CultureInfo.InvariantCulture) { Delimiter = "," });
-
-                foreach (var cn in result.ColumnNames)
+                foreach (var field in row)
                 {
-                    csv.WriteField(cn);
+                    csv.WriteField(field);
                 }
 
                 await csv.NextRecordAsync();
-
-                foreach (var row in result.Results)
-                {
-                    foreach (var field in row)
-                    {
-                        csv.WriteField(field);
-                    }
-
-                    await csv.NextRecordAsync();
-                }
-
-
-                await csv.FlushAsync();
-                ms.Position = 0;
-
-                // send the file
-                await ctx.Channel.SendFileAsync(ms, $"query_result_{DateTime.UtcNow.Ticks}.csv");
             }
 
-            [Cmd]
-            [OwnerOnly]
-            public async Task SqlExec([Leftover] string sql)
-            {
-                try
-                {
-                    var embed = _eb.Create()
-                        .WithTitle(GetText(strs.sql_confirm_exec))
-                        .WithDescription(Format.Code(sql));
 
-                    if (!await PromptUserConfirmAsync(embed))
-                        return;
+            await csv.FlushAsync();
+            ms.Position = 0;
 
-                    var res = await _service.ExecuteSql(sql);
-                    await SendConfirmAsync(res.ToString());
-                }
-                catch (Exception ex)
-                {
-                    await SendErrorAsync(ex.ToString());
-                }
-            }
+            // send the file
+            await ctx.Channel.SendFileAsync(ms, $"query_result_{DateTime.UtcNow.Ticks}.csv");
+        }
 
-            [Cmd]
-            [OwnerOnly]
-            public async Task PurgeUser(ulong userId)
+        [Cmd]
+        [OwnerOnly]
+        public async Task SqlExec([Leftover] string sql)
+        {
+            try
             {
                 var embed = _eb.Create()
-                    .WithDescription(GetText(strs.purge_user_confirm(Format.Bold(userId.ToString()))));
+                               .WithTitle(GetText(strs.sql_confirm_exec))
+                               .WithDescription(Format.Code(sql));
 
                 if (!await PromptUserConfirmAsync(embed))
                     return;
 
-                await _service.PurgeUserAsync(userId);
-                await ctx.OkAsync();
+                var res = await _ds.ExecuteSql(sql);
+                await SendConfirmAsync(res.ToString());
+            }
+            catch (Exception ex)
+            {
+                await SendErrorAsync(ex.ToString());
             }
-
-            [Cmd]
-            [OwnerOnly]
-            public Task PurgeUser([Leftover] IUser user)
-                => PurgeUser(user.Id);
         }
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task PurgeUser(ulong userId)
+        {
+            var embed = _eb.Create()
+                           .WithDescription(GetText(strs.purge_user_confirm(Format.Bold(userId.ToString()))));
+
+            if (!await PromptUserConfirmAsync(embed))
+                return;
+
+            await _ds.PurgeUserAsync(userId);
+            await ctx.OkAsync();
+        }
+
+        [Cmd]
+        [OwnerOnly]
+        public Task PurgeUser([Leftover] IUser user)
+            => PurgeUser(user.Id);
+
+        [Cmd]
+        [OwnerOnly]
+        public Task DeleteXp()
+            => ConfirmActionInternalAsync("Delete Xp", () => _xcs.DeleteXp());
+
+
+        [Cmd]
+        [OwnerOnly]
+        public Task DeleteWaifus()
+            => ConfirmActionInternalAsync("Delete Waifus", () => _gcs.DeleteWaifus());
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task DeleteWaifu(IUser user)
+            => await DeleteWaifu(user.Id);
+
+        [Cmd]
+        [OwnerOnly]
+        public Task DeleteWaifu(ulong userId)
+            => ConfirmActionInternalAsync($"Delete Waifu {userId}", () => _gcs.DeleteWaifu(userId));
+
+
+        [Cmd]
+        [OwnerOnly]
+        public Task DeleteCurrency()
+            => ConfirmActionInternalAsync("Delete Currency", () => _gcs.DeleteCurrency());
     }
-}
-#endif
+}

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommandsService.cs

@@ -3,7 +3,6 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Db.Models;
-using Nadeko.Bot.Db.Models;
 
 namespace NadekoBot.Modules.Administration.Services;