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

feat: fetch from REST instead of cache for cross-cluster lookups

Browse Source
This commit is contained in:
spiral
2022-03-09 20:06:53 -05:00
parent d0ad7abb03
commit ae543b9c18
7 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PluralKit.Bot/CommandSystem/Context/ContextChecksExt.cs
View File

@@ -81,7 +81,10 @@ public static class ContextChecksExt
public static async Task<bool> CheckPermissionsInGuildChannel(this Context ctx, Channel channel,
PermissionSet neededPerms)
{
var guild = await ctx.Cache.GetGuild(channel.GuildId.Value);
// this is a quick hack, should probably do it properly eventually
var guild = await ctx.Cache.TryGetGuild(channel.GuildId.Value);
if (guild == null)
await ctx.Rest.GetGuild(channel.GuildId.Value);
if (guild == null)
return false;

5
PluralKit.Bot/CommandSystem/Context/ContextEntityArgumentsExt.cs
View File

@@ -151,7 +151,10 @@ public static class ContextEntityArgumentsExt
if (!MentionUtils.TryParseChannel(ctx.PeekArgument(), out var id))
return null;
if (!(await ctx.Cache.TryGetChannel(id) is Channel channel))
var channel = await ctx.Cache.TryGetChannel(id);
if (channel == null)
channel = await ctx.Rest.GetChannelOrNull(id);
if (channel == null)
return null;
if (!DiscordUtils.IsValidGuildChannel(channel))