From 34c5f088062712ea7e304430c8985914525e62a9 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 5 Nov 2024 06:09:50 +0100 Subject: [PATCH] Use scopes on switch cases --- commands/misc/timer.js | 15 ++++++++++----- util/morePresence.js | 18 ++++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/commands/misc/timer.js b/commands/misc/timer.js index 746689b..cecbebb 100644 --- a/commands/misc/timer.js +++ b/commands/misc/timer.js @@ -17,21 +17,25 @@ module.exports = { let sendText = "This should never happen."; switch (args[0]) { case "add": - case "create": + case "create": { sendText = await createTimer(message, args, false); break; - case "edit": + } + case "edit": { sendText = "not implemented yet" break; + } case "delete": - case "remove": + case "remove": { let timerID = args[1]; sendText = await deleteTimer(message.author.id, timerID); break; - case "show": + } + case "show": { sendText = await showTimer(message.author.id, args[1]); break; - default: + } + default: { sendText = "not sure what you mean"; if(args.length < 2){ sendText = "Please specify a time, and a message to send after the timer has finished"; @@ -40,6 +44,7 @@ module.exports = { if(!isNaN(parseTime(args[0], Math.floor(new Date() / 1000)))) sendText = await createTimer(message, args, true); break; + } } message.channel.send(sendText); } diff --git a/util/morePresence.js b/util/morePresence.js index 96b3189..0368484 100644 --- a/util/morePresence.js +++ b/util/morePresence.js @@ -1,34 +1,40 @@ module.exports = function (user) { let details; switch (user.presence.activities[0].name) { - case "foobar2000": + case "foobar2000": { let artist = user.presence.activities[0].state.split(":")[0]; let album = user.presence.activities[0].state.split(":")[1].slice(1); details = `Artist: ${artist}\nAlbum: ${album}\nSong: ${user.presence.activities[0].details}\n` break; - case "Apple Music": + } + case "Apple Music": { details = `Artist/Song: ${user.presence.activities[0].details} \nAlbum: ${user.presence.activities[0].state}\n` break; - case "Spotify": + } + case "Spotify": { details = `Artist: ${user.presence.activities[0].state}\nAlbum: ${user.presence.activities[0].details}\nSong: ${user.presence.activities[0].assets.largeText}\n` break; - case "Custom Status": + } + case "Custom Status": { if(user.presence.activities[0].state !== null) details = `"${user.presence.activities[0].state}"\n` else details = ""; break; - case "Code": + } + case "Code": { if(user.presence.activities[0].details != null) if(user.presence.activities[0].details.slice(0, 7) === "Editing") details = `Workspace: ${user.presence.activities[0].state}\nEditing: ${user.presence.activities[0].details.slice(8)}\n` else details = `Workspace: ${user.presence.activities[0].state}\n${user.presence.activities[0].details}\n` break; - default: + } + default: { details = 0; break; + } } return details