minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-04 16:44:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Massive cleanup

Browse Source 
- Removed GuildConfigs repository, moved to extensions
- Moved StreamSettings extension to GuildConfig extensions
- namespace NadekoBot.Core has been simplified to NadekoBot in many places (more to come)
- Replaced some raw delete queries with simple linqtodb queries
This commit is contained in:
Kwoth
2021-06-19 03:32:48 +02:00
parent c7ff982ec1
commit 15dac7e3ed
191 changed files with 563 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections;
using NadekoBot.Common.TypeReaders;
using NadekoBot.Modules.Administration;
using NadekoBot.Modules.Permissions.Services;
namespace NadekoBot.Modules.Permissions
@@ -47,7 +48,7 @@ namespace NadekoBot.Modules.Permissions
var name = command.Name.ToLowerInvariant();
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set.Include(gc => gc.CommandCooldowns));
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.CommandCooldowns));
var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<CommandCooldown>());
var toDelete = config.CommandCooldowns.FirstOrDefault(cc => cc.CommandName == name);

15
src/NadekoBot/Modules/Permissions/FilterCommands.cs
View File

@@ -9,6 +9,7 @@ using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections;
using NadekoBot.Modules.Permissions.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Modules.Administration;
namespace NadekoBot.Modules.Permissions
{
@@ -42,7 +43,7 @@ namespace NadekoBot.Modules.Permissions
bool enabled;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set);
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterInvites = !config.FilterInvites;
await uow.SaveChangesAsync();
}
@@ -68,7 +69,7 @@ namespace NadekoBot.Modules.Permissions
FilterChannelId removed;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set.Include(gc => gc.FilterInvitesChannelIds));
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterInvitesChannelIds));
var match = new FilterChannelId()
{
ChannelId = channel.Id
@@ -107,7 +108,7 @@ namespace NadekoBot.Modules.Permissions
bool enabled;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set);
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterLinks = !config.FilterLinks;
await uow.SaveChangesAsync();
}
@@ -133,7 +134,7 @@ namespace NadekoBot.Modules.Permissions
FilterLinksChannelId removed;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set.Include(gc => gc.FilterLinksChannelIds));
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterLinksChannelIds));
var match = new FilterLinksChannelId()
{
ChannelId = channel.Id
@@ -172,7 +173,7 @@ namespace NadekoBot.Modules.Permissions
bool enabled;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set);
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterWords = !config.FilterWords;
await uow.SaveChangesAsync();
}
@@ -198,7 +199,7 @@ namespace NadekoBot.Modules.Permissions
FilterChannelId removed;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set.Include(gc => gc.FilterWordsChannelIds));
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterWordsChannelIds));
var match = new FilterChannelId()
{
@@ -242,7 +243,7 @@ namespace NadekoBot.Modules.Permissions
FilteredWord removed;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(channel.Guild.Id, set => set.Include(gc => gc.FilteredWords));
var config = uow._context.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilteredWords));
removed = config.FilteredWords.FirstOrDefault(fw => fw.Word.Trim().ToLowerInvariant() == word);

11
src/NadekoBot/Modules/Permissions/Permissions.cs
View File

@@ -10,6 +10,7 @@ using Discord.WebSocket;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.TypeReaders;
using NadekoBot.Common.TypeReaders.Models;
using NadekoBot.Modules.Administration;
using NadekoBot.Modules.Permissions.Common;
using NadekoBot.Modules.Permissions.Services;
@@ -30,7 +31,7 @@ namespace NadekoBot.Modules.Permissions
{
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(ctx.Guild.Id);
var config = uow._context.GcWithPermissionsv2For(ctx.Guild.Id);
if (action == null) action = new PermissionAction(!config.VerbosePermissions); // New behaviour, can toggle.
config.VerbosePermissions = action.Value;
await uow.SaveChangesAsync();
@@ -72,7 +73,7 @@ namespace NadekoBot.Modules.Permissions
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(ctx.Guild.Id);
var config = uow._context.GcWithPermissionsv2For(ctx.Guild.Id);
config.PermissionRole = role.Id.ToString();
uow.SaveChanges();
_service.UpdateCache(config);
@@ -91,7 +92,7 @@ namespace NadekoBot.Modules.Permissions
{
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(ctx.Guild.Id);
var config = uow._context.GcWithPermissionsv2For(ctx.Guild.Id);
config.PermissionRole = null;
await uow.SaveChangesAsync();
_service.UpdateCache(config);
@@ -147,7 +148,7 @@ namespace NadekoBot.Modules.Permissions
Permissionv2 p;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(ctx.Guild.Id);
var config = uow._context.GcWithPermissionsv2For(ctx.Guild.Id);
var permsCol = new PermissionsCollection<Permissionv2>(config.Permissions);
p = permsCol[index];
permsCol.RemoveAt(index);
@@ -178,7 +179,7 @@ namespace NadekoBot.Modules.Permissions
Permissionv2 fromPerm;
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(ctx.Guild.Id);
var config = uow._context.GcWithPermissionsv2For(ctx.Guild.Id);
var permsCol = new PermissionsCollection<Permissionv2>(config.Permissions);
var fromFound = from < permsCol.Count;

3
src/NadekoBot/Modules/Permissions/Services/FilterService.cs
View File

@@ -11,6 +11,7 @@ using NadekoBot.Core.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Internal;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Modules.Administration;
using Serilog;
namespace NadekoBot.Modules.Permissions.Services
@@ -46,7 +47,7 @@ namespace NadekoBot.Modules.Permissions.Services
{
using (var uow = _db.GetDbContext())
{
var gc = uow.GuildConfigs.ForId(guildId,
var gc = uow._context.GuildConfigsForId(guildId,
set => set.Include(x => x.FilteredWords)
.Include(x => x.FilterWordsChannelIds));

9
src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs
View File

@@ -11,6 +11,7 @@ using NadekoBot.Extensions;
using NadekoBot.Modules.Permissions.Common;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Modules.Administration;
namespace NadekoBot.Modules.Permissions.Services
{
@@ -34,7 +35,7 @@ namespace NadekoBot.Modules.Permissions.Services
using (var uow = _db.GetDbContext())
{
foreach (var x in uow.GuildConfigs.Permissionsv2ForAll(client.Guilds.ToArray().Select(x => x.Id).ToList()))
foreach (var x in uow._context.GuildConfigs.Permissionsv2ForAll(client.Guilds.ToArray().Select(x => x.Id).ToList()))
{
Cache.TryAdd(x.GuildId, new PermissionCache()
{
@@ -52,7 +53,7 @@ namespace NadekoBot.Modules.Permissions.Services
{
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.ForId(guildId,
var config = uow._context.GuildConfigsForId(guildId,
set => set.Include(x => x.Permissions));
UpdateCache(config);
}
@@ -67,7 +68,7 @@ namespace NadekoBot.Modules.Permissions.Services
{
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(guildId);
var config = uow._context.GcWithPermissionsv2For(guildId);
//var orderedPerms = new PermissionsCollection<Permissionv2>(config.Permissions);
var max = config.Permissions.Max(x => x.Index); //have to set its index to be the highest
foreach (var perm in perms)
@@ -174,7 +175,7 @@ namespace NadekoBot.Modules.Permissions.Services
{
using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigs.GcWithPermissionsv2For(guildId);
var config = uow._context.GcWithPermissionsv2For(guildId);
config.Permissions = Permissionv2.GetDefaultPermlist;
await uow.SaveChangesAsync();
UpdateCache(config);