Galactic/modmail
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor, remove dupe code and add logging

Browse Source
This commit is contained in:
Erik 2021-06-21 17:54:40 +03:00
parent 30df50614d
commit 6a5d0c8ec2
No known key found for this signature in database
GPG Key ID: 7E862371D3409F16
1 changed files with 82 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
structure/Modmail.js
View File

@ -12,13 +12,15 @@ class Modmail {
this.cache = client.cache; this.cache = client.cache;
this.mainServer = null; this.mainServer = null;
this.bansServer = null; this.bansServer = null;
this.logChannel = null;
this.reminderChannel = null;
const opts = client._options; const opts = client._options;
this.anonColor = opts.anonColor; this.anonColor = opts.anonColor;
this.reminderInterval = opts.modmailReminderInterval || 30; this.reminderInterval = opts.modmailReminderInterval || 30;
this._reminderChannel = opts.modmailReminderChannel || null; this._reminderChannel = opts.modmailReminderChannel || null;
this.reminderChannel = null; this._logChannel = opts.logChannel || null;
this.categories = opts.modmailCategory; this.categories = opts.modmailCategory;
this.updatedThreads = []; this.updatedThreads = [];
@ -52,6 +54,10 @@ class Modmail {
this.sendReminder(); this.sendReminder();
} }
if (this._logChannel) {
this.logChannel = this.client.channels.resolve(this._logChannel);
}
let logStr = `Started modmail handler for ${this.mainServer.name}`; let logStr = `Started modmail handler for ${this.mainServer.name}`;
if (this.bansServer) logStr += ` with ${this.bansServer.name} for ban appeals`; if (this.bansServer) logStr += ` with ${this.bansServer.name} for ban appeals`;
this.client.logger.info(logStr); this.client.logger.info(logStr);
@ -169,7 +175,10 @@ class Modmail {
pastModmail.push({ attachments, author: author.id, content, timestamp: Date.now(), isReply: false }); pastModmail.push({ attachments, author: author.id, content, timestamp: Date.now(), isReply: false });
if (!this.updatedThreads.includes(author.id)) this.updatedThreads.push(author.id); if (!this.updatedThreads.includes(author.id)) this.updatedThreads.push(author.id);
if(!this.queue.includes(author.id)) this.queue.push(author.id); if (!this.queue.includes(author.id)) this.queue.push(author.id);
this.log({ author, action: `${author.tag} (${author.id}) sent new modmail`, content });
await channel.send({ embed }).catch((err) => { await channel.send({ embed }).catch((err) => {
this.client.logger.error(`channel.send errored:\n${err.stack}\nContent: "${content}"`); this.client.logger.error(`channel.send errored:\n${err.stack}\nContent: "${content}"`);
@ -211,42 +220,15 @@ class Modmail {
// Ensure target exists, this should never run into issues // Ensure target exists, this should never run into issues
const [userId] = result; const [userId] = result;
const targetUser = await this.getUser(userId); const targetMember = await this.getMember(userId);
if (!targetMember) return {
if (!targetUser) return {
error: true, error: true,
msg: `User seems to have left.\nReport this if the user is still present.` msg: `User seems to have left.\nReport this if the user is still present.`
}; };
const embed = { this.log({ author, action: `${author.tag}replied to ${targetMember.user.tag}`, content, target: targetMember.user });
author: {
name: anon ? `${this.mainServer.name.toUpperCase()} STAFF` : author.tag,
// eslint-disable-next-line camelcase
icon_url: anon ? this.mainServer.iconURL({ dynamic: true }) : author.displayAvatarURL({ dynamic: true })
},
description: content,
color: anon ? this.anonColor : member.highestRoleColor
};
// Send to target user
const sent = await targetUser.send({ embed }).catch((err) => {
this.client.logger.warn(`Error during DMing user: ${err.message}`);
return {
error: true,
msg: `Failed to send message to target.`
};
});
// Should only error if user has DMs off or has left all mutual servers
if (sent.error) return sent;
if (anon) embed.author = {
name: `${author.tag} (ANON)`,
// eslint-disable-next-line camelcase
icon_url: author.displayAvatarURL({ dynamic: true })
};
await this.channels.send(targetUser, embed, { author: member.id, content, timestamp: Date.now(), isReply: true, anon });
await message.delete().catch(this.client.logger.warn.bind(this.client.logger)); await message.delete().catch(this.client.logger.warn.bind(this.client.logger));
return this.send({ target: targetMember, staff: member, content, anon });
} }
@ -256,19 +238,30 @@ class Modmail {
const targetMember = await this.getMember(target.id); const targetMember = await this.getMember(target.id);
if (!targetMember) return { if (!targetMember) return {
error: true, error: true,
msg: `Cannot find member` msg: `Cannot find member.`
}; };
const { author, member } = message; const { member: staff, author } = message;
// Inline response
await message.channel.send('Delivered.').catch(this.client.logger.error.bind(this.client.logger));
this.log({ author, action: `${author.tag} sent a message to ${targetMember.user.tag}`, content, target: targetMember.user });
// Send to channel in server
return this.send({ target: targetMember, staff, anon, content });
}
async send({ target, staff, anon, content }) {
const embed = { const embed = {
author: { author: {
name: anon ? `${this.mainServer.name.toUpperCase()} STAFF` : author.tag, name: anon ? `${this.mainServer.name.toUpperCase()} STAFF` : staff.user.tag,
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
icon_url: anon ? this.mainServer.iconURL({ dynamic: true }) : author.displayAvatarURL({ dynamic: true }) icon_url: anon ? this.mainServer.iconURL({ dynamic: true }) : staff.user.displayAvatarURL({ dynamic: true })
}, },
description: content, description: content,
color: anon ? this.anonColor : member.highestRoleColor color: anon ? this.anonColor : staff.highestRoleColor
}; };
// Dm the user // Dm the user
@ -281,11 +274,13 @@ class Modmail {
}); });
if (sent.error) return sent; if (sent.error) return sent;
// Inline response if (anon) embed.author = {
await message.channel.send('Delivered.').catch(this.client.logger.error.bind(this.client.logger)); name: `${staff.user.tag} (ANON)`,
// eslint-disable-next-line camelcase
icon_url: staff.user.displayAvatarURL({ dynamic: true })
};
// Send to channel in server await this.channels.send(target, embed, { author: staff.id, content, timestamp: Date.now(), isReply: true, anon });
await this.channels.send(targetMember, embed, { author: member.id, content, timestamp: Date.now(), isReply: true, anon });
} }
@ -298,11 +293,14 @@ class Modmail {
msg: `This command only works in modmail channels without arguments.` msg: `This command only works in modmail channels without arguments.`
}; };
let response = null,
user = null;
if (args.length) { if (args.length) {
// Eventually support marking several threads read at the same time // Eventually support marking several threads read at the same time
const [id] = args; const [id] = args;
let user = await this.client.resolveUser(id, true); user = await this.client.resolveUser(id, true);
let channel = await this.client.resolveChannel(id); let channel = await this.client.resolveChannel(id);
if (channel) { if (channel) {
@ -318,37 +316,39 @@ class Modmail {
}; };
user = await this.client.resolveUser(result[0]); user = await this.client.resolveUser(result[0]);
const response = await this.channels.markread(user.id, channel, author); response = await this.channels.markread(user.id, channel, author);
if (response.error) return response;
return 'Done';
} else if (user) { } else if (user) {
const _ch = this.cache.channels[user.id]; const _ch = this.cache.channels[user.id];
if (_ch) channel = await this.client.resolveChannel(_ch); if (_ch) channel = await this.client.resolveChannel(_ch);
const response = await this.channels.markread(user.id, channel, author); response = await this.channels.markread(user.id, channel, author);
if (response.error) return response;
return 'Done';
} } else return `Could not resolve ${id} to a target.`;
} }
const { channel } = message; if (!response) {
const chCache = this.cache.channels; const { channel } = message;
const result = Object.entries(chCache).find(([, val]) => { const chCache = this.cache.channels;
return val === channel.id; const result = Object.entries(chCache).find(([, val]) => {
}); return val === channel.id;
});
if (!result) return {
error: true,
msg: `This doesn't seem to be a valid modmail channel. Cache might be out of sync. **[MISSING TARGET]**`
};
const [userId] = result;
user = await this.getUser(userId);
response = await this.channels.markread(userId, channel, author);
}
if (!result) return {
error: true,
msg: `This doesn't seem to be a valid modmail channel. Cache might be out of sync. **[MISSING TARGET]**`
};
const [userId] = result;
const response = await this.channels.markread(userId, channel, author);
if (response.error) return response; if (response.error) return response;
this.log({ author, action: `${author.tag} marked ${user.tag}'s thread as read`, target: user });
return 'Done'; return 'Done';
} }
@ -371,6 +371,27 @@ class Modmail {
} }
async log({ author, content, action, target }) {
const embed = {
author: {
name: action,
// eslint-disable-next-line camelcase
icon_url: author.displayAvatarURL({ dynamic: true })
},
description: content ? `\`\`\`${content}\`\`\`` : '',
color: this.mainServer.me.highestRoleColor
};
if (target) {
embed.footer = {
text: `Staff: ${author.id} | Target: ${target.id}`
};
}
this.logChannel.send({ embed }).catch(this.client.logger.error.bind(this.client.logger));
}
getCanned(name) { getCanned(name) {
return this.replies[name.toLowerCase()]; return this.replies[name.toLowerCase()];
} }