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

refactor: cache own user ID in IDiscordCache

Browse source 
- remove Cluster.User
- remove Cluster.Application (it was only being used as an alternative to Cluster.User for some reason)
- move Bot.PermissionsIn to DiscordCacheExtensions
This commit is contained in:
spiral 2021-11-21 19:42:35 -05:00
parent 24ac0725af
commit 7a5ba8246e
No known key found for this signature in database
GPG key ID: A6059F0CA0E1BD31
17 changed files with 61 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PluralKit.Bot/Commands/Checks.cs
View file

@ -87,7 +87,7 @@ namespace PluralKit.Bot
var missingEmojiPermissions = false;
foreach (var channel in await _rest.GetGuildChannels(guild.Id))
{
var botPermissions = await _bot.PermissionsIn(channel.Id);
var botPermissions = await _cache.PermissionsIn(channel.Id);
var webhookPermissions = await _cache.EveryonePermissions(channel);
var userPermissions = PermissionExtensions.PermissionsFor(guild, channel, ctx.Author.Id, senderGuildUser);
@ -176,7 +176,7 @@ namespace PluralKit.Bot
if (!await ctx.CheckPermissionsInGuildChannel(channel, PermissionSet.ViewChannel))
throw new PKError(error);
var botPermissions = await _bot.PermissionsIn(channel.Id);
var botPermissions = await _cache.PermissionsIn(channel.Id);
var webhookPermissions = await _cache.EveryonePermissions(channel);
// We use a bitfield so we can set individual permission bits

2
PluralKit.Bot/Commands/Lists/ContextListExt.cs
View file

@ -61,7 +61,7 @@ namespace PluralKit.Bot
p.IncludeLastSwitch = true;
if (ctx.MatchFlag("with-last-message", "with-last-proxy", "wlm", "wlp"))
throw new PKError("Sorting by last message is temporarily disabled due to database issues, sorry.");
// p.IncludeLastMessage = true;
// p.IncludeLastMessage = true;
if (ctx.MatchFlag("with-message-count", "wmc"))
p.IncludeMessageCount = true;
if (ctx.MatchFlag("with-created", "wc"))

2
PluralKit.Bot/Commands/Misc.cs
View file

@ -59,7 +59,7 @@ namespace PluralKit.Bot
public async Task Invite(Context ctx)
{
var clientId = _botConfig.ClientId ?? _cluster.Application?.Id;
var clientId = _botConfig.ClientId ?? await _cache.GetOwnUser();
var permissions =
PermissionSet.AddReactions |

2
PluralKit.Bot/Commands/ServerConfig.cs
View file

@ -59,7 +59,7 @@ namespace PluralKit.Bot
if (channel.Type != Channel.ChannelType.GuildText)
throw new PKError("PluralKit cannot log messages to this type of channel.");
var perms = await _bot.PermissionsIn(channel.Id);
var perms = await _cache.PermissionsIn(channel.Id);
if (!perms.HasFlag(PermissionSet.SendMessages))
throw new PKError("PluralKit is missing **Send Messages** permissions in the new log channel.");
if (!perms.HasFlag(PermissionSet.EmbedLinks))