indifferentketchup
2fab3b97bf
Dead/stale removals (grep-confirmed no consumers):
- config: drop 9 unread CONFIG keys (ROLE_TO_PING_ID, SIGNATURE,
REMINDER_*, RENAME_LOG_CHANNEL_ID, SETTINGS_*); remove their
ALLOWED_CONFIG_KEYS entries and the orphaned settings-site UI fields
- configSchema: delete unreachable json/string_or_json validators
- models: drop unused ticketTag field
- gmail-poll: remove unused isPollSuspended export
- utils: remove dead htmlToTextWithBlocks/decodeHtmlEntities/BLOCK_TAG_REGEX
- internalApi: remove router._allowedKeys (test it served is gone)
- discord client: drop unused GuildPresences privileged intent
- broccolini-discord: remove dormant /api 503 gate (no /api routes)
Fixes:
- context-menu ticket create now uses makeTicketName('unclaimed', ...)
instead of the contract-violating ticket-<n> name
- drop write-only pending.userId from both close paths
Dedup / simplify:
- new services/transcript.js shares the transcript text/date/header
builders between the button and force-close paths (had drifted)
- resolveEscalationCategoryId() replaces 3 copies of the category logic
- ticketChannelOverwrites() shares the create-permission array between
the two interactive ticket-create paths
- finalizeBody() shares the email-cleanup tail in parseGmailMessage
- getTicketActionRow drops its never-passed options arg;
sendTicketNotificationEmail drops its always-null subjectLine arg
- hoist invariant guild lookup out of the auto-close/unclaim loops
- drop redundant lastActivity write (and now-dead updateTicketActivity)
- /help lists all current commands and the right-click apps
101 lines
3.3 KiB
JavaScript
101 lines
3.3 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 { 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
|
||
);
|
||
} catch (e) {
|
||
console.error('REPLY ERROR:', e);
|
||
}
|
||
}
|
||
|
||
module.exports = { handleDiscordReply };
|