indifferentketchup
cdf85f6364
QUAL-006 store ticket.creatorId on creation; legacy split-pop returned the
message ID for discord-msg-* tickets, breaking transcript DM, close
log, and channel rename for context-menu-created tickets. Adds the
field to the Ticket schema and writes a one-shot backfill script
(scripts/backfill-creatorId.js, dry-run by default).
QUEUE-001 add enqueueOverwrite + enqueueTopic to services/channelQueue.js
(chain on renameChains alongside enqueueMove). Migrate handleAdd /
handleRemove / handleMove / handleTopic so permissionOverwrites,
setParent, and setTopic no longer race pending renames or sends.
handleMove now uses the existing enqueueMove. Initial overwrites in
handleTicketModal stay inline; channel doesn't exist yet so no race.
DISCORD-001 replace ephemeral: true with flags: MessageFlags.Ephemeral across
broccolini-discord.js, handlers/sharedHelpers.js, handlers/buttons.js,
handlers/commands.js. runDeferred opts now take { flags } directly.
SEC-003 /gmailpoll min interval is 30s. Drop the 5s/10s slash-command
choices and clamp Math.max(30000, ms) in handleGmailPoll for
defense in depth.
QUAL-001 upgrade silent .catch(() => {}) on the lastActivity updateOne in
handlers/messages.js to log via logError, so transient Mongo errors
surface in the debug channel instead of disappearing.
QUAL-002 drop await from logError/logWarn calls in services/staffThread.js
and services/pinMessage.js — fire-and-forget per CLAUDE.md hard rule.
QUAL-003 wrap stray setTimeouts (handleConfirmCloseRequest force-close timer,
runFinalClose channel-delete + overflow-cleanup, checkAutoClose
delete-after-email) in trackTimeout via lazy require so they clear
on shutdown.
100 lines
3.2 KiB
JavaScript
100 lines
3.2 KiB
JavaScript
/**
|
||
* Discord messageCreate handler – forwards staff replies to Gmail.
|
||
*/
|
||
const { mongoose } = require('../db-connection');
|
||
const { CONFIG } = require('../config');
|
||
const { extractRawEmail, isStaff } = require('../utils');
|
||
const { getGmailClient, sendGmailReply } = require('../services/gmail');
|
||
const { updateTicketActivity } = require('../services/tickets');
|
||
const { getNotifyDm } = require('../services/staffSettings');
|
||
const { logError } = require('../services/debugLog');
|
||
|
||
const Ticket = mongoose.model('Ticket');
|
||
|
||
/**
|
||
* Handle a Discord message in a ticket channel → relay to Gmail (email tickets only).
|
||
*/
|
||
async function handleDiscordReply(m) {
|
||
if (m.author.bot || m.interaction) return;
|
||
|
||
const ticket = await Ticket.findOne({ discordThreadId: m.channel.id }).lean();
|
||
if (!ticket) return;
|
||
|
||
const memberForCheck = await m.guild.members.fetch(m.author.id).catch(() => null);
|
||
const isStaffMember = isStaff(memberForCheck);
|
||
Ticket.updateOne(
|
||
{ discordThreadId: m.channel.id },
|
||
{ $set: { lastActivity: new Date() } }
|
||
).catch(err => logError('updateActivity', err).catch(() => {}));
|
||
|
||
// DM the claimer if they have notifydm on and a non-staff user replied.
|
||
if (ticket.claimerId && !isStaffMember && m.author.id !== ticket.claimerId) {
|
||
const dmEnabled = await getNotifyDm(ticket.claimerId);
|
||
if (dmEnabled) {
|
||
const staffMember = await m.guild.members.fetch(ticket.claimerId).catch(() => null);
|
||
if (staffMember) {
|
||
const jumpLink = `https://discord.com/channels/${m.guild.id}/${m.channel.id}/${m.id}`;
|
||
await staffMember
|
||
.send(
|
||
`New customer reply in **${m.channel.name}**:\n> ${m.content.slice(0, 300)}\n[Jump to message](${jumpLink})`
|
||
)
|
||
.catch(() => {});
|
||
}
|
||
}
|
||
}
|
||
|
||
if (ticket.gmailThreadId.startsWith('discord-')) {
|
||
return;
|
||
}
|
||
|
||
// Email tickets: send reply via Gmail.
|
||
try {
|
||
const gmail = getGmailClient();
|
||
const thread = await gmail.users.threads.get({
|
||
userId: 'me',
|
||
id: ticket.gmailThreadId
|
||
});
|
||
|
||
const last = [...thread.data.messages].reverse().find(msg => {
|
||
const from =
|
||
msg.payload.headers.find(h => h.name === 'From')?.value || '';
|
||
return !from.toLowerCase().includes(CONFIG.MY_EMAIL);
|
||
});
|
||
|
||
if (!last) return;
|
||
|
||
let recipient =
|
||
last.payload.headers.find(h => h.name === 'From')?.value || '';
|
||
const replyTo =
|
||
last.payload.headers.find(h => h.name === 'Reply-To')?.value;
|
||
if (replyTo) recipient = replyTo;
|
||
|
||
const subject =
|
||
last.payload.headers.find(h => h.name === 'Subject')?.value ||
|
||
'Support';
|
||
const msgId =
|
||
last.payload.headers.find(h => h.name === 'Message-ID')?.value;
|
||
|
||
const recipientEmail = extractRawEmail(recipient).toLowerCase();
|
||
if (!recipientEmail || recipientEmail === CONFIG.MY_EMAIL) {
|
||
console.warn('Bad recipient for reply:', recipientEmail);
|
||
return;
|
||
}
|
||
|
||
await sendGmailReply(
|
||
ticket.gmailThreadId,
|
||
m.content,
|
||
recipientEmail,
|
||
subject,
|
||
msgId,
|
||
m.author.id
|
||
);
|
||
|
||
await updateTicketActivity(ticket.gmailThreadId);
|
||
} catch (e) {
|
||
console.error('REPLY ERROR:', e);
|
||
}
|
||
}
|
||
|
||
module.exports = { handleDiscordReply };
|