engineering
/
ramirez
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'silent' option to !close when closeMessage is specified

master
Dragory 2019-02-23 23:32:18 +02:00
parent f4a295c00e
commit 5e1a1e7e15
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/Thread.js
View File

@ -326,8 +326,8 @@ class Thread {
/** /**
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async close(silent = false) { async close(noSystemMessage = false) {
if (! silent) { if (! noSystemMessage) {
console.log(`Closing thread ${this.id}`); console.log(`Closing thread ${this.id}`);
await this.postSystemMessage('Closing thread...'); await this.postSystemMessage('Closing thread...');
} }

30
src/modules/close.js
View File

@ -41,6 +41,8 @@ module.exports = bot => {
bot.registerCommand('close', async (msg, args) => { bot.registerCommand('close', async (msg, args) => {
let thread, closedBy; let thread, closedBy;
let sendCloseMessage = !! config.closeMessage;
if (msg.channel instanceof Eris.PrivateChannel) { if (msg.channel instanceof Eris.PrivateChannel) {
// User is closing the thread by themselves (if enabled) // User is closing the thread by themselves (if enabled)
if (! config.allowUserClose) return; if (! config.allowUserClose) return;
@ -67,7 +69,7 @@ module.exports = bot => {
// Timed close // Timed close
if (args.length) { if (args.length) {
if (args[0].startsWith('c')) { if (args.includes('cancel') || args.includes('c')) {
// Cancel timed close // Cancel timed close
if (thread.scheduled_close_at) { if (thread.scheduled_close_at) {
await thread.cancelScheduledClose(); await thread.cancelScheduledClose();
@ -75,20 +77,22 @@ module.exports = bot => {
} }
return; return;
} } else if (args.includes('silent') || args.includes('s')) {
sendCloseMessage = false;
} else {
// Set a timed close
const delay = utils.convertDelayStringToMS(args.join(' '));
if (delay === 0 || delay === null) {
thread.postSystemMessage(`Invalid delay specified. Format: "1h30m"`);
return;
}
const closeAt = moment.utc().add(delay, 'ms');
await thread.scheduleClose(closeAt.format('YYYY-MM-DD HH:mm:ss'), msg.author);
thread.postSystemMessage(`Thread is now scheduled to be closed in ${humanizeDelay(delay)}. Use \`${config.prefix}close cancel\` to cancel.`);
// Set a timed close
const delay = utils.convertDelayStringToMS(args.join(' '));
if (delay === 0 || delay === null) {
thread.postSystemMessage(`Invalid delay specified. Format: "1h30m"`);
return; return;
} }
const closeAt = moment.utc().add(delay, 'ms');
await thread.scheduleClose(closeAt.format('YYYY-MM-DD HH:mm:ss'), msg.author);
thread.postSystemMessage(`Thread is now scheduled to be closed in ${humanizeDelay(delay)}. Use \`${config.prefix}close cancel\` to cancel.`);
return;
} }
// Regular close // Regular close
@ -96,7 +100,7 @@ module.exports = bot => {
closedBy = msg.author.username; closedBy = msg.author.username;
} }
if (config.closeMessage) { if (sendCloseMessage) {
await thread.postToUser(config.closeMessage).catch(() => {}); await thread.postToUser(config.closeMessage).catch(() => {});
} }