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

Fix DM events not having proper channel data

Browse Source
This commit is contained in:
Ske 2021-03-21 14:22:55 +01:00
parent a63e75a490
commit ce790b13ae
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Myriad/Cache/DiscordCacheExtensions.cs
View File

@ -28,8 +28,16 @@ namespace Myriad.Cache
return cache.SaveRole(gru.GuildId, gru.Role); return cache.SaveRole(gru.GuildId, gru.Role);
case GuildRoleDeleteEvent grd: case GuildRoleDeleteEvent grd:
return cache.RemoveRole(grd.GuildId, grd.RoleId); return cache.RemoveRole(grd.GuildId, grd.RoleId);
case MessageReactionAddEvent mra:
return cache.TrySaveDmChannelStub(mra.GuildId, mra.ChannelId);
case MessageCreateEvent mc: case MessageCreateEvent mc:
return cache.SaveMessageCreate(mc); return cache.SaveMessageCreate(mc);
case MessageUpdateEvent mu:
return cache.TrySaveDmChannelStub(mu.GuildId.Value, mu.ChannelId);
case MessageDeleteEvent md:
return cache.TrySaveDmChannelStub(md.GuildId, md.ChannelId);
case MessageDeleteBulkEvent md:
return cache.TrySaveDmChannelStub(md.GuildId, md.ChannelId);
} }
return default; return default;
@ -49,14 +57,18 @@ namespace Myriad.Cache
private static async ValueTask SaveMessageCreate(this IDiscordCache cache, MessageCreateEvent evt) private static async ValueTask SaveMessageCreate(this IDiscordCache cache, MessageCreateEvent evt)
{ {
// DM messages don't get Channel Create events first, so we need to save await cache.TrySaveDmChannelStub(evt.GuildId, evt.ChannelId);
// some kind of stub channel object until we get the real one
if (evt.GuildId == null)
await cache.SaveDmChannelStub(evt.ChannelId);
await cache.SaveUser(evt.Author); await cache.SaveUser(evt.Author);
foreach (var mention in evt.Mentions) foreach (var mention in evt.Mentions)
await cache.SaveUser(mention); await cache.SaveUser(mention);
} }
private static ValueTask TrySaveDmChannelStub(this IDiscordCache cache, ulong? guildId, ulong channelId)
{
// DM messages don't get Channel Create events first, so we need to save
// some kind of stub channel object until we get the real one
return guildId == null ? default : cache.SaveDmChannelStub(channelId);
}
} }
} }