await usings and minor cleanup

This commit is contained in:
Kwoth
2021-12-20 03:02:02 +01:00
parent 1b2017024c
commit da2ee0c158
55 changed files with 176 additions and 174 deletions

View File

@@ -45,7 +45,7 @@ public partial class Permissions
}
var name = command.Name.ToLowerInvariant();
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.CommandCooldowns));
var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<CommandCooldown>());

View File

@@ -40,7 +40,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
bool enabled;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterInvites = !config.FilterInvites;
@@ -66,7 +66,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
FilterChannelId removed;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterInvitesChannelIds));
var match = new FilterChannelId()
@@ -105,7 +105,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
bool enabled;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterLinks = !config.FilterLinks;
@@ -131,7 +131,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
FilterLinksChannelId removed;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterLinksChannelIds));
var match = new FilterLinksChannelId()
@@ -170,7 +170,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
bool enabled;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set);
enabled = config.FilterWords = !config.FilterWords;
@@ -196,7 +196,7 @@ public partial class Permissions
var channel = (ITextChannel)ctx.Channel;
FilterChannelId removed;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilterWordsChannelIds));
@@ -240,7 +240,7 @@ public partial class Permissions
return;
FilteredWord removed;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.FilteredWords));

View File

@@ -26,7 +26,7 @@ public partial class Permissions : NadekoModule<PermissionService>
[RequireContext(ContextType.Guild)]
public async Task Verbose(PermissionAction action = null)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(ctx.Guild.Id);
if (action is null) action = new(!config.VerbosePermissions); // New behaviour, can toggle.
@@ -68,7 +68,7 @@ public partial class Permissions : NadekoModule<PermissionService>
return;
}
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(ctx.Guild.Id);
config.PermissionRole = role.Id.ToString();
@@ -87,7 +87,7 @@ public partial class Permissions : NadekoModule<PermissionService>
[Priority(1)]
public async Task PermRole(Reset _)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(ctx.Guild.Id);
config.PermissionRole = null;
@@ -143,7 +143,7 @@ public partial class Permissions : NadekoModule<PermissionService>
try
{
Permissionv2 p;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(ctx.Guild.Id);
var permsCol = new PermissionsCollection<Permissionv2>(config.Permissions);
@@ -175,7 +175,7 @@ public partial class Permissions : NadekoModule<PermissionService>
try
{
Permissionv2 fromPerm;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(ctx.Guild.Id);
var permsCol = new PermissionsCollection<Permissionv2>(config.Permissions);

View File

@@ -71,7 +71,7 @@ public class PermissionService : ILateBlocker, INService
public async Task AddPermissions(ulong guildId, params Permissionv2[] perms)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(guildId);
//var orderedPerms = new PermissionsCollection<Permissionv2>(config.Permissions);
@@ -178,7 +178,7 @@ public class PermissionService : ILateBlocker, INService
public async Task Reset(ulong guildId)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GcWithPermissionsv2For(guildId);
config.Permissions = Permissionv2.GetDefaultPermlist;