diff --git a/PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs b/PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs index 7c2c7515..521c0fd6 100644 --- a/PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs +++ b/PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs @@ -166,18 +166,13 @@ public static class ContextEntityArgumentsExt public static async Task MatchGuild(this Context ctx) { - try - { - var id = ulong.Parse(ctx.PeekArgument()); - var guild = await ctx.Cache.TryGetGuild(id); - if (guild != null) - ctx.PopArgument(); - - return guild; - } - catch (FormatException) - { + if (!ulong.TryParse(ctx.PeekArgument(), out var id)) return null; - } + + var guild = await ctx.Rest.GetGuildOrNull(id); + if (guild != null) + ctx.PopArgument(); + + return guild; } } \ No newline at end of file