liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: don't use 'out' in IDiscordCache methods

Browse Source 
this change is required for async cache (.NET doesn't support async ref/out params)
This commit is contained in:
spiral
2021-11-18 13:11:02 -05:00
parent 3ba46ff456
commit 0efaab6d95
11 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.Bot/CommandSystem/ContextEntityArgumentsExt.cs
View File

@@ -157,7 +157,7 @@ namespace PluralKit.Bot
if (!MentionUtils.TryParseChannel(ctx.PeekArgument(), out var id))
return null;
if (!await ctx.Cache.TryGetChannel(id, out var channel))
if (!(await ctx.Cache.TryGetChannel(id) is Channel channel))
return null;
if (!DiscordUtils.IsValidGuildChannel(channel))
@@ -167,12 +167,12 @@ namespace PluralKit.Bot
return channel;
}
public static Guild MatchGuild(this Context ctx)
public static async Task<Guild> MatchGuild(this Context ctx)
{
try
{
var id = ulong.Parse(ctx.PeekArgument());
ctx.Cache.TryGetGuild(id, out var guild);
var guild = await ctx.Cache.TryGetGuild(id);
if (guild != null)
ctx.PopArgument();