Resolve merge conflicts and fix ticket close permission handling

Author: codebymitch

src/commands/Ticket/close.js

@@ -2,7 +2,7 @@ import { getColor } from '../../config/bot.js';
 import { SlashCommandBuilder, PermissionFlagsBits, ChannelType, MessageFlags } from 'discord.js';
 import { successEmbed } from '../../utils/embeds.js';
 import { logger } from '../../utils/logger.js';
-import { handleInteractionError } from '../../utils/errorHandler.js';
+import { handleInteractionError, replyUserError, ErrorTypes } from '../../utils/errorHandler.js';
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 import { getTicketPermissionContext } from '../../utils/ticketPermissions.js';
 import { closeTicket } from '../../services/ticket.js';
@@ -49,7 +49,7 @@ export default {
                     guildId: interaction.guildId,
                     error: result.error
                 });
-                return await replyUserError(interaction, { type: ErrorTypes.UNKNOWN, message: 'result.error || "This command can only be used in a valid ticket channel."' });
+                return await replyUserError(interaction, { type: ErrorTypes.UNKNOWN, message: result.error || 'This command can only be used in a valid ticket channel.' });
             }
 
             await InteractionHelper.safeEditReply(interaction, {

src/handlers/ticketButtons.js

@@ -7,6 +7,7 @@ import { logger } from '../utils/logger.js';
 import { InteractionHelper } from '../utils/interactionHelper.js';
 import { checkRateLimit } from '../utils/rateLimiter.js';
 import { replyUserError, ErrorTypes } from '../utils/errorHandler.js';
+import { getTicketPermissionContext } from '../utils/ticketPermissions.js';
 
 function escapeHtml(text) {
   if (!text) return '';
@@ -30,6 +31,17 @@ async function ensureGuildContext(interaction) {
   return false;
 }
 
+async function replyPermissionCheckFailure(interaction, permissionCheck) {
+  let type = ErrorTypes.UNKNOWN;
+  if (permissionCheck.error === 'Permission Denied') {
+    type = ErrorTypes.PERMISSION;
+  } else if (permissionCheck.error === 'Request Timeout') {
+    type = ErrorTypes.RATE_LIMIT;
+  }
+
+  await replyUserError(interaction, { type, message: permissionCheck.details });
+}
+
 async function checkTicketPermissionWithTimeout(interaction, client, actionLabel, options = {}, timeoutMs = 2500) {
   const { allowTicketCreator = false } = options;
 
@@ -185,9 +197,7 @@ const closeTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -232,9 +242,7 @@ const closeTicketModalHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -280,9 +288,7 @@ const claimTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -325,9 +331,7 @@ const priorityTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -376,9 +380,7 @@ const pinTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -485,9 +487,7 @@ const unclaimTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -531,9 +531,7 @@ const reopenTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 
@@ -582,9 +580,7 @@ const deleteTicketHandler = {
       );
 
       if (!permissionCheck.success) {
-        if (!interaction.replied && !interaction.deferred) {
-          await replyUserError(interaction, { type: ErrorTypes.PERMISSION, message: permissionCheck.details });
-        }
+        await replyPermissionCheckFailure(interaction, permissionCheck);
         return;
       }
 

src/utils/errorHandler.js

@@ -193,7 +193,7 @@ function logInteractionError(error, errorType, logData) {
 
     if (isUserError || isExpectedError) {
         if (errorType !== ErrorTypes.RATE_LIMIT) {
-            logger.debug(`User Error [${errorType.toUpperCase()}]: ${error.message}`, logData);
+            logger.debug(`User Error [${errorType.toUpperCase()}]: ${error.userMessage || error.message}`, logData);
         }
     } else {
         logger.error(`System Error [${errorType.toUpperCase()}]`, {

src/utils/ticketPermissions.js

@@ -16,7 +16,9 @@ export async function getTicketPermissionContext({ client, interaction }) {
   const hasManageChannels = interaction.member.permissions.has(PermissionFlagsBits.ManageChannels);
   const staffRoleId = config.ticketStaffRoleId || null;
   const hasTicketStaffRole = Boolean(staffRoleId && interaction.member.roles?.cache?.has(staffRoleId));
-  const isTicketCreator = Boolean(ticketData?.userId && ticketData.userId === interaction.user.id);
+  const isTicketCreator = Boolean(
+    ticketData?.userId && String(ticketData.userId) === String(interaction.user.id),
+  );
 
   return {
     config,