Merge pull request #214 from dev-kittens/fix-getchannel

fix GetChannel where guildId is not passed
This commit is contained in:
Astrid 2020-08-15 16:48:39 +02:00 committed by GitHub
commit 6c1e47e857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -271,8 +271,8 @@ namespace PluralKit.Bot
{
// we need to know the channel's guild ID to get the cached guild object, so we grab it from the API
if (guildId == null) {
var guild = await WrapDiscordCall(client.ShardClients.Values.FirstOrDefault().GetChannelAsync(id));
if (guild != null) guildId = guild.Id;
var channel = await WrapDiscordCall(client.ShardClients.Values.FirstOrDefault().GetChannelAsync(id));
if (channel != null) guildId = channel.GuildId;
else return null; // we probably don't have the guild in cache if the API doesn't give it to us
}
return client.GetGuild(guildId.Value).GetChannel(id);