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

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

Browse Source
This commit is contained in:
Kwoth
2023-11-11 05:22:52 +00:00
parent a28be0d343
commit bc77783820
224 changed files with 308 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nadeko.Bot.Common/DbService.cs
View File

@@ -2,7 +2,7 @@
using LinqToDB.Common;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Services.Database;
namespace NadekoBot.Services;

2
src/Nadeko.Bot.Common/Extensions/DbExtensions.cs
View File

@@ -1,8 +1,6 @@
using Microsoft.EntityFrameworkCore;
using NadekoBot.Db;
using NadekoBot.Db.Models;
// todo fix these namespaces. It should only be Nadeko.Bot.Db
using NadekoBot.Services.Database;
namespace NadekoBot.Extensions;

2
src/Nadeko.Bot.Common/GlobalUsings.cs
View File

@@ -12,7 +12,7 @@ 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;
// global using Nadeko.Medusa;
// discord
global using Discord;

2
src/Nadeko.Bot.Common/IBot.cs
View File

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

2
src/Nadeko.Bot.Common/ILogCommandService.cs
View File

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

2
src/Nadeko.Bot.Common/Medusa/IMedusaLoaderService.cs
View File

@@ -1,6 +1,6 @@
using System.Globalization;
namespace Nadeko.Medusa;
namespace Nadeko.Common.Medusa;
public interface IMedusaLoaderService
{

2
src/Nadeko.Bot.Common/Medusa/MedusaLoadResult.cs
View File

@@ -1,4 +1,4 @@
namespace Nadeko.Medusa;
namespace Nadeko.Common.Medusa;
public enum MedusaLoadResult
{

2
src/Nadeko.Bot.Common/Medusa/MedusaUnloadResult.cs
View File

@@ -1,4 +1,4 @@
namespace Nadeko.Medusa;
namespace Nadeko.Common.Medusa;
public enum MedusaUnloadResult
{

4
src/Nadeko.Bot.Common/Nadeko.Bot.Common.csproj
View File

@@ -34,6 +34,8 @@
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\NadekoBot\data\strings\responses\responses.en-US.json" />
<AdditionalFiles Include="..\NadekoBot\data\strings\responses\responses.en-US.json">
<Link>responses.en-US.json</Link>
</AdditionalFiles>
</ItemGroup>
</Project>

5
src/Nadeko.Bot.Common/NadekoModule.cs
View File

@@ -79,9 +79,10 @@ public abstract class NadekoModule : ModuleBase
public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)
{
embed.WithPendingColor().WithFooter("yes/no");
embed.WithPendingColor()
.WithFooter("yes/no");
var msg = await ctx.Channel.EmbedAsync(embed);
var msg = await MessageChannelExtensions.EmbedAsync(ctx.Channel, embed);
try
{
var input = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);

4
src/Nadeko.Bot.Common/Services/CommandHandler.cs
View File

@@ -43,8 +43,8 @@ public class CommandHandler : INService, IReadyExecutor, ICommandHandler
// InteractionService interactions,
IServiceProvider services)
{
_client = client;
_commandService = commandService;
_client = client;
_commandService = commandService;
_bss = bss;
_bot = bot;
_behaviorHandler = behaviorHandler;

2
src/Nadeko.Bot.Common/Services/Currency/DefaultWallet.cs
View File

@@ -1,7 +1,7 @@
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using NadekoBot.Db.Models;
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Services.Currency;

2
src/Nadeko.Bot.Common/Services/Currency/GamblingTxTracker.cs
View File

@@ -2,7 +2,7 @@ using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Services.Currency;
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Services;

2
src/Nadeko.Bot.Common/Services/IRemindService.cs
View File

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

2
src/Nadeko.Bot.Common/Services/Impl/BlacklistService.cs
View File

@@ -5,7 +5,7 @@ using LinqToDB.EntityFrameworkCore;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Db;
using NadekoBot.Db.Models;
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Modules.Permissions.Services;

12
src/Nadeko.Bot.Common/Services/Impl/CommandsUtilityService.cs
View File

@@ -1,4 +1,5 @@
using CommandLine;
using Nadeko.Common.Medusa;
namespace NadekoBot.Common;
@@ -9,7 +10,7 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
private readonly DiscordPermOverrideService _dpos;
private readonly IEmbedBuilderService _eb;
private readonly ILocalization _loc;
private readonly Nadeko.Medusa.IMedusaLoaderService _medusae;
private readonly IMedusaLoaderService _medusae;
public CommandsUtilityService(
CommandHandler ch,
@@ -17,7 +18,7 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
DiscordPermOverrideService dpos,
IEmbedBuilderService eb,
ILocalization loc,
Nadeko.Medusa.IMedusaLoaderService medusae)
IMedusaLoaderService medusae)
{
_ch = ch;
_strings = strings;
@@ -46,10 +47,9 @@ public sealed class CommandsUtilityService : ICommandsUtilityService, INService
if (reqs.Any())
em.AddField(GetText(strs.requires, guild), string.Join("\n", reqs));
em.AddField(_strings.GetText(strs.usage),
string.Join("\n", com.RealRemarksArr(_strings, _medusae, culture, prefix).Map(arg => Format.Code(arg))))
.WithFooter(GetText(strs.module(com.Module.GetTopLevelModule().Name), guild))
.WithOkColor();
Extensions.Extensions.WithOkColor(em.AddField(_strings.GetText(strs.usage),
string.Join("\n", com.RealRemarksArr(_strings, _medusae, culture, prefix).Map(arg => Format.Code(arg))))
.WithFooter(GetText(strs.module(com.Module.GetTopLevelModule().Name), guild)));
var opt = GetNadekoOptionType(com.Attributes);
if (opt is not null)

2
src/Nadeko.Bot.Common/Services/Impl/DiscordPermOverrideService.cs
View File

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

2
src/Nadeko.Bot.Common/_Extensions/Extensions.cs
View File

@@ -3,7 +3,7 @@ using System.Diagnostics;
using System.Globalization;
using System.Text.Json;
using System.Text.RegularExpressions;
using Nadeko.Medusa;
using Nadeko.Common.Medusa;
namespace NadekoBot.Extensions;

9
src/Nadeko.Bot.Common/_Extensions/IMessageChannelExtensions.cs
View File

@@ -1,3 +1,4 @@
namespace NadekoBot.Extensions;
public static class MessageChannelExtensions
@@ -91,10 +92,6 @@ public static class MessageChannelExtensions
return ch.EmbedAsync(builder, inter: inter);
}
// regular send overloads
public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
=> ch.SendAsync(eb, text, MsgType.Error);
public static Task<IUserMessage> SendConfirmAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
=> ch.SendAsync(eb, text, MsgType.Ok);
@@ -147,6 +144,10 @@ public static class MessageChannelExtensions
string? url = null,
string? footer = null)
=> ch.SendAsync(eb, MsgType.Error, title, text, url, footer);
// regular send overloads
public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, IEmbedBuilderService eb, string text)
=> ch.SendAsync(eb, text, MsgType.Error);
public static Task SendPaginatedConfirmAsync(
this ICommandContext ctx,

3
src/Nadeko.Bot.Common/_Extensions/SocketMessageComponentExtensions.cs
View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Extensions;

namespace NadekoBot.Extensions;
public static class SocketMessageComponentExtensions
{

2
src/Nadeko.Bot.Db/Extensions/CurrencyTransactionExtensions.cs
View File

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

2
src/Nadeko.Bot.Db/Extensions/DbExtensions.cs
View File

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

4
src/Nadeko.Bot.Db/Extensions/GuildConfigExtensions.cs
View File

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

2
src/Nadeko.Bot.Db/Extensions/NadekoExpressionExtensions.cs
View File

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

14
src/Nadeko.Bot.Db/Extensions/QuoteExtensions.cs
View File

@@ -1,6 +1,6 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Db;
@@ -29,10 +29,8 @@ public static class QuoteExtensions
ulong guildId,
string keyword)
{
// todo figure shuffle out
return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToListAsync())
.Shuffle()
.FirstOrDefault();
return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToArrayAsync())
.RandomOrDefault();
}
public static async Task<Quote> SearchQuoteKeywordTextAsync(
@@ -41,15 +39,13 @@ public static class QuoteExtensions
string keyword,
string text)
{
var rngk = new NadekoRandom();
return (await quotes.AsQueryable()
.Where(q => q.GuildId == guildId
&& (keyword == null || q.Keyword == keyword)
&& (EF.Functions.Like(q.Text.ToUpper(), $"%{text.ToUpper()}%")
|| EF.Functions.Like(q.AuthorName, text)))
.ToListAsync())
.OrderBy(_ => rngk.Next())
.FirstOrDefault();
.ToArrayAsync())
.RandomOrDefault();
}
public static void RemoveAllByKeyword(this DbSet<Quote> quotes, ulong guildId, string keyword)

2
src/Nadeko.Bot.Db/Extensions/ReminderExtensions.cs
View File

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

2
src/Nadeko.Bot.Db/Extensions/SelfAssignableRolesExtensions.cs
View File

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

4
src/Nadeko.Bot.Db/Extensions/UserXpExtensions.cs
View File

@@ -2,8 +2,8 @@
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Services.Database;
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Db;

2
src/Nadeko.Bot.Db/Extensions/WarningExtensions.cs
View File

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

3
src/Nadeko.Bot.Db/GlobalUsings.cs
View File

@@ -7,12 +7,11 @@
//
// // nadekobot
global using NadekoBot;
global using NadekoBot.Services;
global using Nadeko.Common;
// global using NadekoBot.Common; // old + nadekobot specific things
// global using NadekoBot.Common.Attributes;
// global using NadekoBot.Extensions;
// global using Nadeko.Snake;
// global using Nadeko.Medusa;
// // discord
// global using Discord;

2
src/Nadeko.Bot.Db/Models/AutoCommand.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AutoCommand : DbEntity
{

2
src/Nadeko.Bot.Db/Models/AutoPublishChannel.cs
View File

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

2
src/Nadeko.Bot.Db/Models/AutoTranslateChannel.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AutoTranslateChannel : DbEntity
{

2
src/Nadeko.Bot.Db/Models/AutoTranslateUser.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AutoTranslateUser : DbEntity
{

2
src/Nadeko.Bot.Db/Models/BlacklistEntry.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class BlacklistEntry : DbEntity
{

2
src/Nadeko.Bot.Db/Models/CommandAlias.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class CommandAlias : DbEntity
{

2
src/Nadeko.Bot.Db/Models/CommandCooldown.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class CommandCooldown : DbEntity
{

2
src/Nadeko.Bot.Db/Models/CurrencyTransaction.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class CurrencyTransaction : DbEntity
{

2
src/Nadeko.Bot.Db/Models/DbEntity.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class DbEntity
{

2
src/Nadeko.Bot.Db/Models/DelMsgOnCmdChannel.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class DelMsgOnCmdChannel : DbEntity
{

2
src/Nadeko.Bot.Db/Models/DiscordPemOverride.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Nadeko.Bot.Db;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class DiscordPermOverride : DbEntity
{

2
src/Nadeko.Bot.Db/Models/DiscordUser.cs
View File

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

2
src/Nadeko.Bot.Db/Models/Event.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class CurrencyEvent
{

2
src/Nadeko.Bot.Db/Models/FeedSub.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class FeedSub : DbEntity
{

2
src/Nadeko.Bot.Db/Models/FollowedStream.cs
View File

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

2
src/Nadeko.Bot.Db/Models/GCChannelId.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class GCChannelId : DbEntity
{

2
src/Nadeko.Bot.Db/Models/GamblingStats.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class GamblingStats : DbEntity
{

2
src/Nadeko.Bot.Db/Models/GroupName.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class GroupName : DbEntity
{

2
src/Nadeko.Bot.Db/Models/GuildConfig.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using NadekoBot.Db.Models;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class GuildConfig : DbEntity
{

2
src/Nadeko.Bot.Db/Models/IgnoredLogItem.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class IgnoredLogItem : DbEntity
{

2
src/Nadeko.Bot.Db/Models/IgnoredVoicePresenceChannel.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class IgnoredVoicePresenceChannel : DbEntity
{

2
src/Nadeko.Bot.Db/Models/ImageOnlyChannel.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class ImageOnlyChannel : DbEntity
{

2
src/Nadeko.Bot.Db/Models/LogSetting.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class LogSetting : DbEntity
{

2
src/Nadeko.Bot.Db/Models/NsfwBlacklistedTag.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class NsfwBlacklistedTag : DbEntity
{

2
src/Nadeko.Bot.Db/Models/Permission.cs
View File

@@ -2,7 +2,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
[DebuggerDisplay("{PrimaryTarget}{SecondaryTarget} {SecondaryTargetName} {State} {PrimaryTargetId}")]
public class Permissionv2 : DbEntity, IIndexed

2
src/Nadeko.Bot.Db/Models/PlantedCurrency.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class PlantedCurrency : DbEntity
{

2
src/Nadeko.Bot.Db/Models/PlaylistSong.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class PlaylistSong : DbEntity
{

2
src/Nadeko.Bot.Db/Models/Poll.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class Poll : DbEntity
{

2
src/Nadeko.Bot.Db/Models/PollVote.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class PollVote : DbEntity
{

2
src/Nadeko.Bot.Db/Models/ReactionRole.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class ReactionRoleV2 : DbEntity
{

2
src/Nadeko.Bot.Db/Models/Reminder.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class Reminder : DbEntity
{

2
src/Nadeko.Bot.Db/Models/Repeater.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class Repeater
{

2
src/Nadeko.Bot.Db/Models/RotatingPlayingStatus.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using Nadeko.Bot.Db;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class RotatingPlayingStatus : DbEntity
{

2
src/Nadeko.Bot.Db/Models/SelfAssignableRole.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class SelfAssignedRole : DbEntity
{

2
src/Nadeko.Bot.Db/Models/ShopEntry.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public enum ShopEntryType
{

2
src/Nadeko.Bot.Db/Models/StreamOnlineMessage.cs
View File

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

2
src/Nadeko.Bot.Db/Models/StreamRoleSettings.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class StreamRoleSettings : DbEntity
{

2
src/Nadeko.Bot.Db/Models/VcRoleInfo.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class VcRoleInfo : DbEntity
{

2
src/Nadeko.Bot.Db/Models/anti/AntiAltSetting.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AntiAltSetting
{

2
src/Nadeko.Bot.Db/Models/anti/AntiRaidSetting.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
// todo db required, nullable?

2
src/Nadeko.Bot.Db/Models/anti/AntiSpamIgnore.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AntiSpamIgnore : DbEntity
{

2
src/Nadeko.Bot.Db/Models/anti/AntiSpamSetting.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class AntiSpamSetting : DbEntity
{

2
src/Nadeko.Bot.Db/Models/club/ClubInfo.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
using NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Db.Models;

2
src/Nadeko.Bot.Db/Models/currency/BankUser.cs
View File

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

2
src/Nadeko.Bot.Db/Models/expr/NadekoExpression.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class NadekoExpression : DbEntity
{

2
src/Nadeko.Bot.Db/Models/expr/Quote.cs
View File

@@ -1,7 +1,7 @@
#nullable disable
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class Quote : DbEntity
{

2
src/Nadeko.Bot.Db/Models/filter/FilterChannelId.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class FilterChannelId : DbEntity
{

2
src/Nadeko.Bot.Db/Models/filter/FilterLinksChannelId.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class FilterLinksChannelId : DbEntity
{

2
src/Nadeko.Bot.Db/Models/filter/FilteredWord.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class FilteredWord : DbEntity
{

2
src/Nadeko.Bot.Db/Models/punish/BanTemplate.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class BanTemplate : DbEntity
{

2
src/Nadeko.Bot.Db/Models/punish/MutedUserId.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class MutedUserId : DbEntity
{

2
src/Nadeko.Bot.Db/Models/punish/PunishmentAction.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public enum PunishmentAction
{

2
src/Nadeko.Bot.Db/Models/punish/WarnExpireAction.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public enum WarnExpireAction
{

2
src/Nadeko.Bot.Db/Models/punish/Warning.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class Warning : DbEntity
{

2
src/Nadeko.Bot.Db/Models/punish/WarningPunishment.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class WarningPunishment : DbEntity
{

2
src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredRole.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class SlowmodeIgnoredRole : DbEntity
{

2
src/Nadeko.Bot.Db/Models/slowmode/SlowmodeIgnoredUser.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class SlowmodeIgnoredUser : DbEntity
{

2
src/Nadeko.Bot.Db/Models/support/RewardedUser.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class RewardedUser : DbEntity
{

2
src/Nadeko.Bot.Db/Models/untimer/UnbanTimer.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class UnbanTimer : DbEntity
{

2
src/Nadeko.Bot.Db/Models/untimer/UnmuteTimer.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class UnmuteTimer : DbEntity
{

2
src/Nadeko.Bot.Db/Models/untimer/UnroleTimer.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class UnroleTimer : DbEntity
{

2
src/Nadeko.Bot.Db/Models/xp/UserXpStats.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class UserXpStats : DbEntity
{

2
src/Nadeko.Bot.Db/Models/xp/XpSettings.cs
View File

@@ -1,5 +1,5 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
namespace Nadeko.Bot.Db.Models;
public class XpSettings : DbEntity
{

2
src/Nadeko.Bot.Modules.Administration/AdministrationService.cs
View File

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

2
src/Nadeko.Bot.Modules.Administration/AutoAssignableRoles/AutoAssignRoleService.cs
View File

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

2
src/Nadeko.Bot.Modules.Administration/DangerousCommands/DangerousCommandsService.cs
View File

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

2
src/Nadeko.Bot.Modules.Administration/GlobalUsings.cs
View File

@@ -13,7 +13,7 @@ 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;
// global using Nadeko.Medusa;
// discord
global using Discord;

2
src/Nadeko.Bot.Modules.Administration/GreetBye/GreetService.cs
View File

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

2
src/Nadeko.Bot.Modules.Administration/GreetBye/GreetSettings.cs
View File

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

2
src/Nadeko.Bot.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 NadekoBot.Services.Database.Models;
using Nadeko.Bot.Db.Models;
namespace NadekoBot.Modules.Administration.Services;

Some files were not shown because too many files have changed in this diff Show More