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

fix(bot): check bot perms for UseExternalEmojis instead of @/everyone

Browse Source
This commit is contained in:
Iris System 2022-08-05 09:42:01 +12:00
parent fcd1ec486e
commit 1ea37696e3
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PluralKit.Bot/Commands/Checks.cs
View File

@ -24,7 +24,7 @@ public class Checks
{ {
PermissionSet.ViewChannel, PermissionSet.SendMessages, PermissionSet.AddReactions, PermissionSet.ViewChannel, PermissionSet.SendMessages, PermissionSet.AddReactions,
PermissionSet.AttachFiles, PermissionSet.EmbedLinks, PermissionSet.ManageMessages, PermissionSet.AttachFiles, PermissionSet.EmbedLinks, PermissionSet.ManageMessages,
PermissionSet.ManageWebhooks, PermissionSet.ReadMessageHistory PermissionSet.ManageWebhooks, PermissionSet.ReadMessageHistory, PermissionSet.UseExternalEmojis
}; };
// todo: make sure everything uses the minimum amount of REST calls necessary // todo: make sure everything uses the minimum amount of REST calls necessary
@ -74,11 +74,9 @@ public class Checks
// Loop through every channel and group them by sets of permissions missing // Loop through every channel and group them by sets of permissions missing
var permissionsMissing = new Dictionary<ulong, List<Channel>>(); var permissionsMissing = new Dictionary<ulong, List<Channel>>();
var hiddenChannels = false; var hiddenChannels = false;
var missingEmojiPermissions = false;
foreach (var channel in await _rest.GetGuildChannels(guild.Id)) foreach (var channel in await _rest.GetGuildChannels(guild.Id))
{ {
var botPermissions = PermissionExtensions.PermissionsFor(guild, channel, await _cache.GetOwnUser(), guildMember); var botPermissions = PermissionExtensions.PermissionsFor(guild, channel, await _cache.GetOwnUser(), guildMember);
var webhookPermissions = PermissionExtensions.EveryonePermissions(guild, channel);
var userPermissions = PermissionExtensions.PermissionsFor(guild, channel, ctx.Author.Id, senderGuildUser); var userPermissions = PermissionExtensions.PermissionsFor(guild, channel, ctx.Author.Id, senderGuildUser);
if ((userPermissions & PermissionSet.ViewChannel) == 0) if ((userPermissions & PermissionSet.ViewChannel) == 0)
@ -98,12 +96,6 @@ public class Checks
if ((botPermissions & requiredPermission) == 0) if ((botPermissions & requiredPermission) == 0)
missingPermissionField |= (ulong)requiredPermission; missingPermissionField |= (ulong)requiredPermission;
if ((webhookPermissions & PermissionSet.UseExternalEmojis) == 0)
{
missingPermissionField |= (ulong)PermissionSet.UseExternalEmojis;
missingEmojiPermissions = true;
}
// If we're not missing any permissions, don't bother adding it to the dict // If we're not missing any permissions, don't bother adding it to the dict
// This means we can check if the dict is empty to see if all channels are proxyable // This means we can check if the dict is empty to see if all channels are proxyable
if (missingPermissionField != 0) if (missingPermissionField != 0)
@ -136,12 +128,6 @@ public class Checks
var footer = ""; var footer = "";
if (hiddenChannels) if (hiddenChannels)
footer += "Some channels were ignored as you do not have view access to them."; footer += "Some channels were ignored as you do not have view access to them.";
if (missingEmojiPermissions)
{
if (hiddenChannels) footer += " | ";
footer +=
"Use External Emojis permissions must be granted to the @everyone role / Default Permissions.";
}
if (footer.Length > 0) if (footer.Length > 0)
eb.Footer(new Embed.EmbedFooter(footer)); eb.Footer(new Embed.EmbedFooter(footer));
@ -172,7 +158,6 @@ public class Checks
throw new PKError(error); throw new PKError(error);
var botPermissions = PermissionExtensions.PermissionsFor(guild, channel, await _cache.GetOwnUser(), guildMember); var botPermissions = PermissionExtensions.PermissionsFor(guild, channel, await _cache.GetOwnUser(), guildMember);
var webhookPermissions = PermissionExtensions.EveryonePermissions(guild, channel);
// We use a bitfield so we can set individual permission bits // We use a bitfield so we can set individual permission bits
ulong missingPermissions = 0; ulong missingPermissions = 0;
@ -181,9 +166,6 @@ public class Checks
if ((botPermissions & requiredPermission) == 0) if ((botPermissions & requiredPermission) == 0)
missingPermissions |= (ulong)requiredPermission; missingPermissions |= (ulong)requiredPermission;
if ((webhookPermissions & PermissionSet.UseExternalEmojis) == 0)
missingPermissions |= (ulong)PermissionSet.UseExternalEmojis;
// Generate the output embed // Generate the output embed
var eb = new EmbedBuilder() var eb = new EmbedBuilder()
.Title($"Permission check for **{channel.Name}**"); .Title($"Permission check for **{channel.Name}**");
@ -200,10 +182,6 @@ public class Checks
if (((ulong)permission & missingPermissions) == (ulong)permission) if (((ulong)permission & missingPermissions) == (ulong)permission)
missing += $"\n- **{permission.ToPermissionString()}**"; missing += $"\n- **{permission.ToPermissionString()}**";
if (((ulong)PermissionSet.UseExternalEmojis & missingPermissions) ==
(ulong)PermissionSet.UseExternalEmojis)
missing += $"\n- **{PermissionSet.UseExternalEmojis.ToPermissionString()}**";
eb.Description($"Missing permissions:\n{missing}"); eb.Description($"Missing permissions:\n{missing}");
} }