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

Merge pull request #202 from acw0/bugfix/dsharpcache

Browse Source 
Fix pk;msg errors across shards
This commit is contained in:
Astrid 2020-07-22 16:33:27 +02:00 committed by GitHub
commit a0d4ab5809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PluralKit.Bot/Services/EmbedService.cs
View File

@ -158,8 +158,7 @@ namespace PluralKit.Bot {
public async Task<DiscordEmbed> CreateMessageInfoEmbed(DiscordClient client, FullMessage msg) public async Task<DiscordEmbed> CreateMessageInfoEmbed(DiscordClient client, FullMessage msg)
{ {
var ctx = LookupContext.ByNonOwner; var ctx = LookupContext.ByNonOwner;
var channel = await _client.GetChannel(msg.Message.Channel);
var channel = await client.GetChannel(msg.Message.Channel);
var serverMsg = channel != null ? await channel.GetMessage(msg.Message.Mid) : null; var serverMsg = channel != null ? await channel.GetMessage(msg.Message.Mid) : null;
// Need this whole dance to handle cases where: // Need this whole dance to handle cases where:

22
PluralKit.Bot/Utils/DiscordUtils.cs
View File

@ -256,6 +256,28 @@ namespace PluralKit.Bot
public static Task<DiscordMessage> GetMessage(this DiscordRestClient client, ulong channel, ulong message) => public static Task<DiscordMessage> GetMessage(this DiscordRestClient client, ulong channel, ulong message) =>
WrapDiscordCall(client.GetMessageAsync(channel, message)); WrapDiscordCall(client.GetMessageAsync(channel, message));
public static DiscordGuild GetGuild(this DiscordShardedClient client, ulong id)
{
DiscordGuild guild;
foreach (DiscordClient shard in client.ShardClients.Values)
{
shard.Guilds.TryGetValue(id, out guild);
if (guild != null) return guild;
}
return null;
}
public static async Task<DiscordChannel> GetChannel(this DiscordShardedClient client, ulong id, ulong? guildId = null)
{
// 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;
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);
}
private static async Task<T> WrapDiscordCall<T>(Task<T> t) private static async Task<T> WrapDiscordCall<T>(Task<T> t)
where T: class where T: class
{ {