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

@@ -57,7 +57,7 @@ public partial class Utility
return;
}
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var config = uow.GuildConfigsForId(ctx.Guild.Id, set => set.Include(x => x.CommandAliases));
var toAdd = new CommandAlias()

View File

@@ -44,7 +44,7 @@ public partial class Utility
return;
IEnumerable<Quote> quotes;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
quotes = uow.Quotes.GetGroup(ctx.Guild.Id, page, order);
}
@@ -67,7 +67,7 @@ public partial class Utility
keyword = keyword.ToUpperInvariant();
Quote quote;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
quote = await uow.Quotes.GetRandomQuoteByKeywordAsync(ctx.Guild.Id, keyword);
//if (quote != null)
@@ -95,7 +95,7 @@ public partial class Utility
public async Task QuoteShow(int id)
{
Quote quote;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
quote = uow.Quotes.GetById(id);
if (quote?.GuildId != ctx.Guild.Id)
@@ -132,7 +132,7 @@ public partial class Utility
keyword = keyword.ToUpperInvariant();
Quote keywordquote;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
keywordquote = await uow.Quotes.SearchQuoteKeywordTextAsync(ctx.Guild.Id, keyword, text);
}
@@ -157,7 +157,7 @@ public partial class Utility
.WithDefault(Context)
.Build();
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
quote = uow.Quotes.GetById(id);
}
@@ -186,7 +186,7 @@ public partial class Utility
keyword = keyword.ToUpperInvariant();
Quote q;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
uow.Quotes.Add(q = new()
{
@@ -209,7 +209,7 @@ public partial class Utility
var success = false;
string response;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var q = uow.Quotes.GetById(id);
@@ -241,7 +241,7 @@ public partial class Utility
keyword = keyword.ToUpperInvariant();
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
uow.Quotes.RemoveAllByKeyword(ctx.Guild.Id, keyword.ToUpperInvariant());
@@ -289,7 +289,7 @@ public partial class Utility
public async Task QuotesExport()
{
IEnumerable<Quote> quotes;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
quotes = uow.Quotes
.GetForGuild(ctx.Guild.Id)

View File

@@ -107,7 +107,7 @@ public partial class Utility
.WithTitle(GetText(isServer ? strs.reminder_server_list : strs.reminder_list));
List<Reminder> rems;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
if (isServer)
{
@@ -164,7 +164,7 @@ public partial class Utility
return;
Reminder rem = null;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var rems = isServer
? uow.Reminders
@@ -219,7 +219,7 @@ public partial class Utility
ServerId = ctx.Guild?.Id ?? 0
};
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
uow.Reminders.Add(rem);
await uow.SaveChangesAsync();

View File

@@ -231,7 +231,7 @@ public class PatreonRewardsService : INService
{
var eligibleFor = (int)(cents * settings.PatreonCurrencyPerCent);
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var users = uow.Set<RewardedUser>();
var usr = await users.FirstOrDefaultAsyncEF(x => x.PatreonUserId == patreonUserId);

View File

@@ -61,7 +61,7 @@ public class RemindService : INService
private async Task RemoveReminders(List<Reminder> reminders)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
uow.Set<Reminder>()
.RemoveRange(reminders);

View File

@@ -138,7 +138,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
public async Task<bool> TriggerExternal(ulong guildId, int index)
{
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
var toTrigger = await uow.Repeaters
.AsNoTracking()
@@ -290,8 +290,8 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
private async Task RemoveRepeaterInternal(Repeater r)
{
_noRedundant.TryRemove(r.Id);
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
await uow
.Repeaters
.DeleteAsync(x => x.Id == r.Id);
@@ -314,7 +314,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
private async Task SetRepeaterLastMessageInternal(int repeaterId, ulong lastMsgId)
{
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
await uow.Repeaters
.AsQueryable()
.Where(x => x.Id == repeaterId)
@@ -345,7 +345,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
DateAdded = DateTime.UtcNow
};
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
if (await uow.Repeaters.CountAsyncEF(x => x.GuildId == guildId) < MAX_REPEATERS)
uow.Repeaters.Add(rep);
@@ -365,8 +365,8 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
{
if (index > MAX_REPEATERS * 2)
throw new ArgumentOutOfRangeException(nameof(index));
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
var toRemove = await uow.Repeaters
.AsNoTracking()
.Where(x => x.GuildId == guildId)
@@ -398,7 +398,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
public async Task<bool?> ToggleRedundantAsync(ulong guildId, int index)
{
using var uow = _db.GetDbContext();
await using var uow = _db.GetDbContext();
var toToggle = await uow
.Repeaters
.AsQueryable()

View File

@@ -70,7 +70,7 @@ public class StreamRoleService : INService
userName.ThrowIfNull(nameof(userName));
var success = false;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var streamRoleSettings = uow.GetStreamRoleSettings(guild.Id);
@@ -135,7 +135,7 @@ public class StreamRoleService : INService
{
keyword = keyword?.Trim()?.ToLowerInvariant();
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var streamRoleSettings = uow.GetStreamRoleSettings(guild.Id);
@@ -181,7 +181,7 @@ public class StreamRoleService : INService
addRole.ThrowIfNull(nameof(addRole));
StreamRoleSettings setting;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var streamRoleSettings = uow.GetStreamRoleSettings(fromRole.Guild.Id);
@@ -208,7 +208,7 @@ public class StreamRoleService : INService
/// <param name="guildId">Guild's Id</param>
public async Task StopStreamRole(IGuild guild, bool cleanup = false)
{
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
var streamRoleSettings = uow.GetStreamRoleSettings(guild.Id);
streamRoleSettings.Enabled = false;

View File

@@ -441,7 +441,7 @@ public partial class Utility : NadekoModule
return msg;
})
});
using (var stream = await JsonConvert.SerializeObject(grouping, Formatting.Indented).ToStream().ConfigureAwait(false))
await using (var stream = await JsonConvert.SerializeObject(grouping, Formatting.Indented).ToStream().ConfigureAwait(false))
{
await ctx.User.SendFileAsync(stream, title, title, false).ConfigureAwait(false);
}