minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 17:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some aliases and reworked namespaces

Browse Source
This commit is contained in:
Kwoth
2024-04-27 16:03:48 +00:00
parent e0819f760c
commit 812b865add
344 changed files with 3166 additions and 3314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/Administration/Administration.cs
View File

@@ -113,7 +113,7 @@ public partial class Administration : NadekoModule<AdministrationService>
embed.AddField(GetText(strs.channel_delmsgoncmd), str);
await ctx.Channel.EmbedAsync(embed);
await EmbedAsync(embed);
}
[Cmd]

3
src/NadekoBot/Modules/Administration/AdministrationService.cs
View File

@@ -1,8 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Common;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleService.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using System.Net;
using System.Threading.Channels;
using LinqToDB;

222
src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs
View File

@@ -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
}

1
src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommandsService.cs
View File

@@ -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;

3
src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
View File

@@ -1,8 +1,7 @@
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using System.Threading.Channels;
using NadekoBot.Common;
namespace NadekoBot.Services;

2
src/NadekoBot/Modules/Administration/GreetBye/GreetSettings.cs
View File

@@ -1,4 +1,4 @@
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Services;

2
src/NadekoBot/Modules/Administration/ImageOnlyChannelService.cs
View File

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Caching.Memory;
using NadekoBot.Common.ModuleBehaviors;
using System.Net;
using System.Threading.Channels;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/LocalizationCommands.cs
View File

@@ -112,7 +112,7 @@ public partial class Administration
[Cmd]
public async Task LanguagesList()
=> await ctx.Channel.EmbedAsync(_eb.Create()
=> await EmbedAsync(_eb.Create()
.WithOkColor()
.WithTitle(GetText(strs.lang_list))
.WithDescription(string.Join("\n",

2
src/NadekoBot/Modules/Administration/Mute/MuteService.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

5
src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateService.cs
View File

@@ -1,8 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Common;
using NadekoBot.Common.ModuleBehaviors;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;
@@ -90,7 +89,7 @@ public sealed class PlayingRotateService : INService, IReadyExecutor
var toAdd = new RotatingPlayingStatus
{
Status = status,
Type = (Nadeko.Bot.Db.ActivityType)activityType
Type = (NadekoBot.Db.DbActivityType)activityType
};
uow.Add(toAdd);
await uow.SaveChangesAsync();

2
src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using NadekoBot.Common.TypeReaders.Models;
using NadekoBot.Modules.Administration.Services;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

2
src/NadekoBot/Modules/Administration/Protection/ProtectionService.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using System.Threading.Channels;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/Protection/ProtectionStats.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

2
src/NadekoBot/Modules/Administration/Protection/PunishQueueItem.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

2
src/NadekoBot/Modules/Administration/Role/IReactionRoleService.cs
View File

@@ -1,6 +1,6 @@
#nullable disable
using NadekoBot.Modules.Patronage;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using OneOf;
using OneOf.Types;

2
src/NadekoBot/Modules/Administration/Role/ReactionRolesService.cs
View File

@@ -4,7 +4,7 @@ using LinqToDB.EntityFrameworkCore;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db;
using NadekoBot.Modules.Patronage;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using OneOf.Types;
using OneOf;

1
src/NadekoBot/Modules/Administration/Role/RoleCommands.cs
View File

@@ -1,5 +1,4 @@
#nullable disable
using System.Xml.Schema;
using SixLabors.ImageSharp.PixelFormats;
using Color = SixLabors.ImageSharp.Color;

2
src/NadekoBot/Modules/Administration/Role/StickyRolesService.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db;

5
src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
View File

@@ -1,7 +1,6 @@
#nullable disable
using NadekoBot.Common;
using NadekoBot.Modules.Administration.Services;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using Nadeko.Common.Medusa;
namespace NadekoBot.Modules.Administration;
@@ -113,7 +112,7 @@ public partial class Administration
};
_service.AddNewAutoCommand(cmd);
await ctx.Channel.EmbedAsync(_eb.Create()
await EmbedAsync(_eb.Create()
.WithOkColor()
.WithTitle(GetText(strs.scadd))
.AddField(GetText(strs.server),

3
src/NadekoBot/Modules/Administration/Self/SelfService.cs
View File

@@ -1,11 +1,10 @@
#nullable disable
using NadekoBot.Common.ModuleBehaviors;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using System.Collections.Immutable;
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesService.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/ServerLog/DummyLogCommandService.cs
View File

@@ -1,4 +1,4 @@
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

2
src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
View File

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Caching.Memory;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db;
using NadekoBot.Modules.Administration.Services;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

4
src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs
View File

@@ -1,5 +1,5 @@
using NadekoBot.Common.TypeReaders.Models;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;
@@ -46,7 +46,7 @@ public partial class Administration
? "-"
: string.Join('\n', usrs.Select(x => $"{x.LogItemId} | <@{x.LogItemId}>")));
await ctx.Channel.EmbedAsync(eb);
await EmbedAsync(eb);
}
[Cmd]

2
src/NadekoBot/Modules/Administration/Timezone/GuildTimezoneService.cs
View File

@@ -1,6 +1,6 @@
#nullable disable
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using NadekoBot.Common.ModuleBehaviors;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
View File

@@ -3,7 +3,7 @@ using CommandLine;
using Humanizer.Localisation;
using NadekoBot.Common.TypeReaders.Models;
using NadekoBot.Modules.Administration.Services;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration;

3
src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
View File

@@ -2,12 +2,11 @@
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Common;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Common.TypeReaders.Models;
using NadekoBot.Db;
using NadekoBot.Modules.Permissions.Services;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
using Newtonsoft.Json;
namespace NadekoBot.Modules.Administration.Services;

2
src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs
View File

@@ -68,7 +68,7 @@ public partial class Administration
else
text = GetText(strs.no_vcroles);
await ctx.Channel.EmbedAsync(_eb.Create()
await EmbedAsync(_eb.Create()
.WithOkColor()
.WithTitle(GetText(strs.vc_role_list))
.WithDescription(text));

2
src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db;
using Nadeko.Bot.Db.Models;
using NadekoBot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;