Skip to content

Commit a320ccf

Browse files
ErisaErisa
committed
always HGETALL with async/await
1 parent 4aa22fa commit a320ccf

9 files changed

+18
-18
lines changed

‎Commands/Debug.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task MuteDebug(CommandContext ctx, DiscordUser targetUser = default
3131
string strOut = "";
3232
if (targetUser == default)
3333
{
34-
var muteList = Program.db.HashGetAll("mutes").ToDictionary();
34+
var muteList = (await Program.db.HashGetAllAsync("mutes")).ToDictionary();
3535
if (muteList is null | muteList.Keys.Count == 0)
3636
{
3737
await ctx.RespondAsync("No mutes found in database!");
@@ -70,7 +70,7 @@ public async Task BanDebug(CommandContext ctx, DiscordUser targetUser = default)
7070
string strOut = "";
7171
if (targetUser == default)
7272
{
73-
var banList = Program.db.HashGetAll("bans").ToDictionary();
73+
var banList = (await Program.db.HashGetAllAsync("bans")).ToDictionary();
7474
if (banList is null | banList.Keys.Count == 0)
7575
{
7676
await ctx.RespondAsync("No bans found in database!");
@@ -186,7 +186,7 @@ public async Task MostWarningsCmd(CommandContext ctx)
186186
{
187187
if (ulong.TryParse(key.ToString(), out ulong number))
188188
{
189-
var warnings = Program.db.HashGetAll(key);
189+
var warnings = await Program.db.HashGetAllAsync(key);
190190
Dictionary<long, MemberPunishment> warningdict = new();
191191
foreach (var warning in warnings)
192192
{

‎Commands/InteractionCommands/UserNoteInteractions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public async Task<IEnumerable<DiscordAutoCompleteChoice>> Provider(AutocompleteC
206206

207207
var user = await ctx.Client.GetUserAsync((ulong)useroption.Value);
208208

209-
var notes = Program.db.HashGetAll(user.Id.ToString())
209+
var notes = (await Program.db.HashGetAllAsync(user.Id.ToString()))
210210
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note).ToDictionary(
211211
x => x.Name.ToString(),
212212
x => JsonConvert.DeserializeObject<UserNote>(x.Value)

‎Commands/InteractionCommands/WarningInteractions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public async Task<IEnumerable<DiscordAutoCompleteChoice>> Provider(AutocompleteC
155155

156156
var user = await ctx.Client.GetUserAsync((ulong)useroption.Value);
157157

158-
var warnings = Program.db.HashGetAll(user.Id.ToString())
158+
var warnings = (await Program.db.HashGetAllAsync(user.Id.ToString()))
159159
.Where(x => JsonConvert.DeserializeObject<UserWarning>(x.Value).Type == WarningType.Warning).ToDictionary(
160160
x => x.Name.ToString(),
161161
x => JsonConvert.DeserializeObject<UserWarning>(x.Value)

‎Commands/Warnings.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public async Task MostWarningsCmd(CommandContext ctx)
258258
{
259259
if (ulong.TryParse(key.ToString(), out ulong number))
260260
{
261-
counts[key.ToString()] = Program.db.HashGetAll(key).Count(x => JsonConvert.DeserializeObject<UserWarning>(x.Value.ToString()).Type == WarningType.Warning);
261+
counts[key.ToString()] = (await Program.db.HashGetAllAsync(key)).Count(x => JsonConvert.DeserializeObject<UserWarning>(x.Value.ToString()).Type == WarningType.Warning);
262262
}
263263
}
264264

@@ -291,7 +291,7 @@ public async Task MostWarningsDayCmd(CommandContext ctx)
291291
{
292292
if (ulong.TryParse(key.ToString(), out ulong number))
293293
{
294-
var warningsOutput = Program.db.HashGetAll(key.ToString()).ToDictionary(
294+
var warningsOutput = (await Program.db.HashGetAllAsync(key.ToString())).ToDictionary(
295295
x => x.Name.ToString(),
296296
x => JsonConvert.DeserializeObject<UserWarning>(x.Value)
297297
);

‎Events/MemberEvents.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static async Task GuildMemberAdded(DiscordClient client, GuildMemberAdded
2727
LogChannelHelper.LogMessageAsync("users", $"{cfgjson.Emoji.UserJoin} **Member joined the server!** - {e.Member.Id}", userLogEmbed);
2828

2929
// Get this user's notes that are set to show on join/leave
30-
var userNotes = db.HashGetAll(e.Member.Id.ToString())
30+
var userNotes = (await db.HashGetAllAsync(e.Member.Id.ToString()))
3131
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note
3232
&& JsonConvert.DeserializeObject<UserNote>(x.Value).ShowOnJoinAndLeave).ToDictionary(
3333
x => x.Name.ToString(),
@@ -174,7 +174,7 @@ public static async Task GuildMemberRemoved(DiscordClient client, GuildMemberRem
174174
LogChannelHelper.LogMessageAsync("users", $"{cfgjson.Emoji.UserLeave} **Member left the server!** - {e.Member.Id}", userLogEmbed);
175175

176176
// Get this user's notes that are set to show on join/leave
177-
var userNotes = db.HashGetAll(e.Member.Id.ToString())
177+
var userNotes = (await db.HashGetAllAsync(e.Member.Id.ToString()))
178178
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note
179179
&& JsonConvert.DeserializeObject<UserNote>(x.Value).ShowOnJoinAndLeave).ToDictionary(
180180
x => x.Name.ToString(),

‎Events/MessageEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public static async Task MessageHandlerAsync(DiscordClient client, MockDiscordMe
193193
// Add notes to message if any exist & are set to show on modmail
194194

195195
// Get user notes
196-
var notes = Program.db.HashGetAll(modmailMember.Id.ToString())
196+
var notes = (await Program.db.HashGetAllAsync(modmailMember.Id.ToString()))
197197
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note).ToDictionary(
198198
x => x.Name.ToString(),
199199
x => JsonConvert.DeserializeObject<UserNote>(x.Value)

‎Helpers/UserNoteHelpers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static async Task<DiscordEmbed> GenerateUserNotesEmbedAsync(DiscordUser u
99
// If provided with a set of notes, use them instead
1010
if (notesToUse == default)
1111
{
12-
notes = Program.db.HashGetAll(user.Id.ToString())
12+
notes = (await Program.db.HashGetAllAsync(user.Id.ToString()))
1313
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note).ToDictionary(
1414
x => x.Name.ToString(),
1515
x => JsonConvert.DeserializeObject<UserNote>(x.Value)

‎Helpers/WarningHelpers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class WarningHelpers
44
{
55
public static async Task<DiscordEmbed> GenerateWarningsEmbedAsync(DiscordUser targetUser)
66
{
7-
var warningsOutput = Program.db.HashGetAll(targetUser.Id.ToString())
7+
var warningsOutput = (await Program.db.HashGetAllAsync(targetUser.Id.ToString()))
88
.Where(x => JsonConvert.DeserializeObject<UserWarning>(x.Value).Type == WarningType.Warning).ToDictionary(
99
x => x.Name.ToString(),
1010
x => JsonConvert.DeserializeObject<UserWarning>(x.Value)
@@ -244,7 +244,7 @@ public static async Task<UserWarning> GiveWarningAsync(DiscordUser targetUser, D
244244
);
245245

246246
// automute handling
247-
var warningsOutput = Program.db.HashGetAll(targetUser.Id.ToString()).ToDictionary(
247+
var warningsOutput = (await Program.db.HashGetAllAsync(targetUser.Id.ToString())).ToDictionary(
248248
x => x.Name.ToString(),
249249
x => JsonConvert.DeserializeObject<UserWarning>(x.Value)
250250
);
@@ -282,7 +282,7 @@ public static async Task<UserWarning> GiveWarningAsync(DiscordUser targetUser, D
282282
if (!modUser.IsBot)
283283
{
284284
// Get notes
285-
var notes = Program.db.HashGetAll(targetUser.Id.ToString())
285+
var notes = (await Program.db.HashGetAllAsync(targetUser.Id.ToString()))
286286
.Where(x => JsonConvert.DeserializeObject<UserNote>(x.Value).Type == WarningType.Note).ToDictionary(
287287
x => x.Name.ToString(),
288288
x => JsonConvert.DeserializeObject<UserNote>(x.Value)

‎Tasks/PunishmentTasks.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ internal class PunishmentTasks
55
public static async Task<bool> CheckBansAsync()
66
{
77
DiscordGuild targetGuild = Program.homeGuild;
8-
Dictionary<string, MemberPunishment> banList = Program.db.HashGetAll("bans").ToDictionary(
8+
Dictionary<string, MemberPunishment> banList = (await Program.db.HashGetAllAsync("bans")).ToDictionary(
99
x => x.Name.ToString(),
1010
x => JsonConvert.DeserializeObject<MemberPunishment>(x.Value)
1111
);
@@ -34,7 +34,7 @@ public static async Task<bool> CheckBansAsync()
3434
}
3535
public static async Task<bool> CheckMutesAsync()
3636
{
37-
Dictionary<string, MemberPunishment> muteList = Program.db.HashGetAll("mutes").ToDictionary(
37+
Dictionary<string, MemberPunishment> muteList = (await Program.db.HashGetAllAsync("mutes")).ToDictionary(
3838
x => x.Name.ToString(),
3939
x => JsonConvert.DeserializeObject<MemberPunishment>(x.Value)
4040
);
@@ -69,7 +69,7 @@ public static async Task<bool> CleanUpPunishmentMessagesAsync()
6969

7070
if (Program.cfgjson.AutoWarnMsgAutoDeleteDays > 0)
7171
{
72-
Dictionary<string, UserWarning> warnList = Program.db.HashGetAll("automaticWarnings").ToDictionary(
72+
Dictionary<string, UserWarning> warnList = (await Program.db.HashGetAllAsync("automaticWarnings")).ToDictionary(
7373
x => x.Name.ToString(),
7474
x => JsonConvert.DeserializeObject<UserWarning>(x.Value)
7575
);
@@ -102,7 +102,7 @@ public static async Task<bool> CleanUpPunishmentMessagesAsync()
102102

103103
if (Program.cfgjson.CompromisedAccountBanMsgAutoDeleteDays > 0)
104104
{
105-
Dictionary<string, MemberPunishment> banList = Program.db.HashGetAll("compromisedAccountBans").ToDictionary(
105+
Dictionary<string, MemberPunishment> banList = (await Program.db.HashGetAllAsync("compromisedAccountBans")).ToDictionary(
106106
x => x.Name.ToString(),
107107
x => JsonConvert.DeserializeObject<MemberPunishment>(x.Value)
108108
);

0 commit comments

Comments
 (0)