indifferentketchup/broccolini-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts: take local version

Browse Source
This commit is contained in:
indifferentketchup
2026-04-06 16:39:43 -05:00
parent 4b984312a8 840923bd4a
commit 356b617ca5
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
handlers/commands.js
View File

@@ -149,13 +149,17 @@ async function runEscalation(interaction, ticket, nextTier, reason) {
});
if (!isDiscordTicket && ticket.gmailThreadId) {
const emailBody = CONFIG.ESCALATION_MESSAGE.replace(/\{support_name\}/g, CONFIG.SUPPORT_NAME) + (reason ? `\n\nReason: ${reason}` : '');
await sendTicketNotificationEmail(
ticket,
`Ticket escalated to ${nextTier === 1 ? 'tier 2' : 'tier 3'}`,
emailBody,
interaction.member?.displayName || interaction.user.username
);
try {
const emailBody = CONFIG.ESCALATION_MESSAGE.replace(/\{support_name\}/g, CONFIG.SUPPORT_NAME) + (reason ? `\n\nReason: ${reason}` : '');
await sendTicketNotificationEmail(
ticket,
`Ticket escalated to ${nextTier === 1 ? 'tier 2' : 'tier 3'}`,
emailBody,
interaction.member?.displayName || interaction.user.username
);
} catch (emailErr) {
console.error('Escalation email failed (non-fatal):', emailErr.message);
}
}
if (nextTier === 2 && ticket.welcomeMessageId) {
@@ -1204,4 +1208,4 @@ async function handleAutocomplete(interaction) {
}
}
module.exports = { handleCommand, handleContextMenu, handleAutocomplete, runEscalation, runDeescalation };
module.exports = { handleCommand, handleContextMenu, handleAutocomplete, runEscalation, runDeescalation };