eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: get guild from REST for pk;proxy across clusters

Browse source 
also closes #330.
This commit is contained in:
spiral 2022-03-30 05:54:21 -04:00
parent 494f93d629
commit 973d6d883c
No known key found for this signature in database
GPG key ID: 244A11E4B0BCF40E
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs
View file

@ -166,18 +166,13 @@ public static class ContextEntityArgumentsExt
public static async Task<Guild> MatchGuild(this Context ctx) public static async Task<Guild> MatchGuild(this Context ctx)
{ {
try if (!ulong.TryParse(ctx.PeekArgument(), out var id))
{
var id = ulong.Parse(ctx.PeekArgument());
var guild = await ctx.Cache.TryGetGuild(id);
if (guild != null)
ctx.PopArgument();
return guild;
}
catch (FormatException)
{
return null; return null;
}
var guild = await ctx.Rest.GetGuildOrNull(id);
if (guild != null)
ctx.PopArgument();
return guild;
} }
} }