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

Fix missing -v/-s options for !loglink, add same options for !logs

cshd
Dragory 2020-10-22 00:40:01 +03:00
parent bbca6a873f
commit 371c49981c
No known key found for this signature in database
GPG Key ID: 5F387BA66DF8AAC1
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/logs.js
View File

@ -6,6 +6,19 @@ const { getLogUrl, getLogFile, getLogCustomResponse, saveLogToStorage } = requir
const LOG_LINES_PER_PAGE = 10; const LOG_LINES_PER_PAGE = 10;
module.exports = ({ bot, knex, config, commands, hooks }) => { module.exports = ({ bot, knex, config, commands, hooks }) => {
const addOptQueryStringToUrl = (url, args) => {
const params = [];
if (args.verbose) params.push("verbose=1");
if (args.simple) params.push("simple=1");
if (params.length === 0) {
return url;
}
const hasQueryString = url.indexOf("?") > -1;
return url + (hasQueryString ? "&" : "?") + params.join("&");
};
const logsCmd = async (msg, args, thread) => { const logsCmd = async (msg, args, thread) => {
let userId = args.userId || (thread && thread.user_id); let userId = args.userId || (thread && thread.user_id);
if (! userId) return; if (! userId) return;
@ -32,7 +45,7 @@ module.exports = ({ bot, knex, config, commands, hooks }) => {
const threadLines = await Promise.all(userThreads.map(async thread => { const threadLines = await Promise.all(userThreads.map(async thread => {
const logUrl = await getLogUrl(thread); const logUrl = await getLogUrl(thread);
const formattedLogUrl = logUrl const formattedLogUrl = logUrl
? `<${logUrl}>` ? `<${addOptQueryStringToUrl(logUrl, args)}>`
: `View log with \`${config.prefix}log ${thread.id}\`` : `View log with \`${config.prefix}log ${thread.id}\``
const formattedDate = moment.utc(thread.created_at).format("MMM Do [at] HH:mm [UTC]"); const formattedDate = moment.utc(thread.created_at).format("MMM Do [at] HH:mm [UTC]");
return `\`${formattedDate}\`: ${formattedLogUrl}`; return `\`${formattedDate}\`: ${formattedLogUrl}`;
@ -72,7 +85,7 @@ module.exports = ({ bot, knex, config, commands, hooks }) => {
const logUrl = await getLogUrl(thread); const logUrl = await getLogUrl(thread);
if (logUrl) { if (logUrl) {
msg.channel.createMessage(`Open the following link to view the log:\n<${logUrl}>`); msg.channel.createMessage(`Open the following link to view the log:\n<${addOptQueryStringToUrl(logUrl, args)}>`);
return; return;
} }
@ -85,11 +98,16 @@ module.exports = ({ bot, knex, config, commands, hooks }) => {
msg.channel.createMessage("This thread's logs are not currently available"); msg.channel.createMessage("This thread's logs are not currently available");
}; };
commands.addInboxServerCommand("logs", "<userId:userId> [page:number]", logsCmd); const logCmdOptions = [
commands.addInboxServerCommand("logs", "[page:number]", logsCmd); { name: "verbose", shortcut: "v", isSwitch: true },
{ name: "simple", shortcut: "s", isSwitch: true },
];
commands.addInboxServerCommand("log", "[threadId:string]", logCmd); commands.addInboxServerCommand("logs", "<userId:userId> [page:number]", logsCmd, { options: logCmdOptions });
commands.addInboxServerCommand("loglink", "[threadId:string]", logCmd); commands.addInboxServerCommand("logs", "[page:number]", logsCmd, { options: logCmdOptions });
commands.addInboxServerCommand("log", "[threadId:string]", logCmd, { options: logCmdOptions });
commands.addInboxServerCommand("loglink", "[threadId:string]", logCmd, { options: logCmdOptions });
hooks.afterThreadClose(async ({ threadId }) => { hooks.afterThreadClose(async ({ threadId }) => {
const thread = await threads.findById(threadId); const thread = await threads.findById(threadId);