fix(bot): account for implicit permissions

CarelessInternet · Feb 11, 2024 · 0497b63 · 0497b63
1 parent f3bf0ba
commit 0497b63
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/apps/bot/src/commands/thread-ticketing/panel.ts b/apps/bot/src/commands/thread-ticketing/panel.ts
@@ -92,13 +92,13 @@ export class ModalInteraction extends Modal.Interaction {
 
  const me = await guild.members.fetchMe();
 
- if (!channel.permissionsFor(me).has([PermissionFlagsBits.SendMessages])) {
+ if (!channel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages])) {
  return interaction.editReply({
  embeds: [
  super
  .userEmbedError(user)
  // eslint-disable-next-line @typescript-eslint/no-base-to-string
- .setDescription(`I do not have the send messages permission in ${channel.toString()}.`),
+ .setDescription(`I do not have the viwe channel and send messages permission in ${channel.toString()}.`),
  ],
  });
  }

diff --git a/apps/bot/src/commands/thread-ticketing/ticket.ts b/apps/bot/src/commands/thread-ticketing/ticket.ts
@@ -314,6 +314,7 @@ export class ModalInteraction extends Modal.Interaction {
  .has([
  PermissionFlagsBits.MentionEveryone,
  PermissionFlagsBits.ManageMessages,
+ PermissionFlagsBits.ViewChannel,
  PermissionFlagsBits.SendMessagesInThreads,
  isPrivate ? PermissionFlagsBits.CreatePrivateThreads : PermissionFlagsBits.CreatePublicThreads,
  ])
@@ -322,6 +323,7 @@ export class ModalInteraction extends Modal.Interaction {
  [
  'Mention All Roles',
  'Manage Messages',
+ 'View Channel',
  'Send Messages in Threads',
  `Create ${isPrivate ? 'Private' : 'Public'} Threads`,
  ].join(', '),

diff --git a/apps/bot/src/events/guild/GuildMemberAdd.ts b/apps/bot/src/events/guild/GuildMemberAdd.ts
@@ -19,7 +19,7 @@ export default class extends Event.Handler {
 
  const me = await members.fetchMe();
 
- if (!channel.permissionsFor(me).has(PermissionFlagsBits.SendMessages)) return;
+ if (!channel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages])) return;
 
  if (data.welcomeNewMemberRoles.length > 0) {
  const highestRoleWithManageRoles = me.roles.cache

diff --git a/apps/bot/src/events/guild/GuildMemberRemove.ts b/apps/bot/src/events/guild/GuildMemberRemove.ts
@@ -19,7 +19,7 @@ export default class extends Event.Handler {
 
  const me = await members.fetchMe();
 
- if (!channel.permissionsFor(me).has(PermissionFlagsBits.SendMessages)) return;
+ if (!channel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages])) return;
 
  const embed = farewellEmbed({
  data: {

diff --git a/apps/bot/src/events/guild/MessageCreate.ts b/apps/bot/src/events/guild/MessageCreate.ts
@@ -17,7 +17,11 @@ export default class extends Event.Handler {
  if (
  !message.channel
  .permissionsFor(me)
- .has([PermissionFlagsBits.CreatePublicThreads, PermissionFlagsBits.SendMessagesInThreads])
+ .has([
+ PermissionFlagsBits.CreatePublicThreads,
+ PermissionFlagsBits.ViewChannel,
+ PermissionFlagsBits.SendMessagesInThreads,
+ ])
  )
  return;
  if (message.author.id === me.id) return;

diff --git a/apps/bot/src/events/guild/ThreadCreate.ts b/apps/bot/src/events/guild/ThreadCreate.ts
@@ -14,7 +14,8 @@ export default class extends Event.Handler {
  const parent = thread.parent ?? (await thread.guild.channels.fetch(thread.parentId));
  const me = await thread.guild.members.fetchMe();
 
- if (!parent?.permissionsFor(me).has([PermissionFlagsBits.SendMessagesInThreads])) return;
+ if (!parent?.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessagesInThreads]))
+ return;
 
  if (parent.type === ChannelType.GuildForum) {
  const user = await thread.client.users.fetch(thread.ownerId ?? '');

diff --git a/apps/bot/src/utils/thread-ticketing/closeTicket.ts b/apps/bot/src/utils/thread-ticketing/closeTicket.ts
@@ -66,7 +66,8 @@ export async function closeTicket(
  const logsChannel = await guild.channels.fetch(row.logsChannelId);
 
  if (!logsChannel?.isTextBased()) return;
- if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.SendMessages])) return;
+ if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages]))
+ return;
 
  void logsChannel.send({
  embeds: [

diff --git a/apps/bot/src/utils/thread-ticketing/deleteTicket.ts b/apps/bot/src/utils/thread-ticketing/deleteTicket.ts
@@ -65,7 +65,8 @@ export async function deleteTicket(
  const logsChannel = await guild.channels.fetch(row.logsChannelId);
 
  if (!logsChannel?.isTextBased()) return;
- if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.SendMessages])) return;
+ if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages]))
+ return;
 
  void logsChannel.send({
  embeds: [

diff --git a/apps/bot/src/utils/thread-ticketing/lockTicket.ts b/apps/bot/src/utils/thread-ticketing/lockTicket.ts
@@ -80,7 +80,8 @@ export async function lockTicket(
  const logsChannel = await guild.channels.fetch(row.logsChannelId);
 
  if (!logsChannel?.isTextBased()) return;
- if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.SendMessages])) return;
+ if (!logsChannel.permissionsFor(me).has([PermissionFlagsBits.ViewChannel, PermissionFlagsBits.SendMessages]))
+ return;
 
  void logsChannel.send({
  embeds: [