indifferentketchup
3c13e55dad
QUAL-004 handlers/messages.js — DM-on-customer-reply now reads guild.members.cache.get(claimerId) first and only falls back to guild.members.fetch on cache miss. Avoids a REST round-trip per non-staff reply on busy tickets. GuildMembers intent already keeps the cache warm. QUAL-005 handlers/buttons.js (runFinalClose) + handlers/commands/close.js (finalizeForceClose) — close paths now $unset welcomeMessageId alongside the status: 'closed' write. Stops a stale message-ID from carrying into a future reopen on the same Gmail thread, where escalation's "edit welcome buttons" path would silently fail trying to fetch a message in a deleted channel. QUAL-007 services/configPersistence.js — writeEnvFile mismatch error now includes the missing/extra key sets, not just count vs count. Saves the operator from guessing which key vanished after a partial write. QUAL-008 utils.js stripEmailQuotes — replaced order-dependent first-match loop with an earliest-match-across-all-markers scan. The previous code could truncate at a late "_____" signature underline even when an earlier "On X wrote:" reply header was the real cutoff. New test in tests/utils.test.js exercises the dual-marker case. QUAL-010 broccolini-discord.js — moved `let httpServer / internalServer / appReady` declarations from after the ready handler to before it. Same runtime behavior (module-load completes before ready fires asynchronously), but the read order now matches the assignment order. SEC-002 routes/internalApi.js — POST /restart now goes through a tighter 2/min limiter on top of the shared 10/min internalLimiter. Defense in depth in case INTERNAL_API_SECRET ever leaks; an attacker with the secret can no longer crash-loop the container. Skipped: QUAL-009 (re-checked the regex; ^\s*\n* → \n is already idempotent — the audit finding was incorrect). vitest run: 88/88 (one new test for QUAL-008).
104 lines
3.4 KiB
JavaScript
104 lines
3.4 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) {
|
||
// Cache-first: GuildMembers intent keeps the cache populated; only fetch
|
||
// on miss (e.g. cold cache after restart). Avoids a REST round-trip on
|
||
// every customer reply in a busy ticket.
|
||
const staffMember = m.guild.members.cache.get(ticket.claimerId)
|
||
|| 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 };
|