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

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
No known key found for this signature in database
GPG key ID: 244A11E4B0BCF40E
7 changed files with 80 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PluralKit.Bot/Commands/Message.cs
View file

@ -20,7 +20,7 @@ namespace PluralKit.Bot;
public class ProxiedMessage
{
private static readonly Duration EditTimeout = Duration.FromMinutes(10);
private readonly IDiscordCache _cache;
// private readonly IDiscordCache _cache;
private readonly IClock _clock;
private readonly EmbedService _embeds;
@ -37,7 +37,7 @@ public class ProxiedMessage
_rest = rest;
_webhookExecutor = webhookExecutor;
_logChannel = logChannel;
_cache = cache;
// _cache = cache;
}
public async Task EditMessage(Context ctx)
@ -112,7 +112,7 @@ public class ProxiedMessage
var error =
"The channel where the message was sent does not exist anymore, or you are missing permissions to access it.";
var channel = await _cache.GetChannel(msg.Message.Channel);
var channel = await _rest.GetChannelOrNull(msg.Message.Channel);
if (channel == null)
throw new PKError(error);
@ -165,7 +165,7 @@ public class ProxiedMessage
var showContent = true;
var noShowContentError = "Message deleted or inaccessible.";
var channel = await _cache.GetChannel(message.Message.Channel);
var channel = await _rest.GetChannelOrNull(message.Message.Channel);
if (channel == null)
showContent = false;
else if (!await ctx.CheckPermissionsInGuildChannel(channel, PermissionSet.ViewChannel))
@ -222,7 +222,7 @@ public class ProxiedMessage
if (ctx.Match("author") || ctx.MatchFlag("author"))
{
var user = await _cache.GetOrFetchUser(_rest, message.Message.Sender);
var user = await _rest.GetUser(message.Message.Sender);
var eb = new EmbedBuilder()
.Author(new Embed.EmbedAuthor(
user != null