From 5d6a88860c566d5e8e1930ee6e34d39825dfba28 Mon Sep 17 00:00:00 2001 From: KGT1 Date: Mon, 18 Jan 2021 07:31:25 +0100 Subject: [PATCH] fix lint --- src/index.js | 19 +++++++++---------- src/playbackmanager.js | 18 ++++++++---------- src/util.js | 5 +---- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/index.js b/src/index.js index 93c95b1..3337c2d 100644 --- a/src/index.js +++ b/src/index.js @@ -10,32 +10,31 @@ try { handleChannelMessage } = require("./messagehandler"); const log = require("loglevel"); - const prefix = require('loglevel-plugin-prefix'); - const chalk = require('chalk'); + const prefix = require("loglevel-plugin-prefix"); + const chalk = require("chalk"); const colors = { TRACE: chalk.magenta, DEBUG: chalk.cyan, INFO: chalk.blue, WARN: chalk.yellow, - ERROR: chalk.red, + ERROR: chalk.red }; log.setLevel(CONFIG["log-level"]); - prefix.reg(log); log.enableAll(); prefix.apply(log, { - format(level, name, timestamp) { + format (level, name, timestamp) { return `${chalk.gray(`[${timestamp}]`)} ${colors[level.toUpperCase()](level)} ${chalk.green(`${name}:`)}`; - }, + } }); - prefix.apply(log.getLogger('critical'), { - format(level, name, timestamp) { + prefix.apply(log.getLogger("critical"), { + format (level, name, timestamp) { return chalk.red.bold(`[${timestamp}] ${level} ${name}:`); - }, + } }); jellyfinClientManager.init(); @@ -51,4 +50,4 @@ try { discordClient.login(CONFIG.token); } catch (error) { console.error(error); -} \ No newline at end of file +} diff --git a/src/playbackmanager.js b/src/playbackmanager.js index 3c27911..c361d3e 100644 --- a/src/playbackmanager.js +++ b/src/playbackmanager.js @@ -31,7 +31,7 @@ function streamURLbuilder (itemID, bitrate) { } function startPlaying (voiceconnection = discordclientmanager.getDiscordClient().user.client.voice.connections.first(), itemIDPlaylist = currentPlayingPlaylist, playlistIndex = currentPlayingPlaylistIndex, seekTo, disconnectOnFinish = _disconnectOnFinish) { - log.debug("start playing ",playlistIndex, ". of list: ",itemIDPlaylist," in a voiceconnection?: ", typeof voiceconnection !== "undefined"); + log.debug("start playing ", playlistIndex, ". of list: ", itemIDPlaylist, " in a voiceconnection?: ", typeof voiceconnection !== "undefined"); isPaused = false; currentPlayingPlaylist = itemIDPlaylist; currentPlayingPlaylistIndex = playlistIndex; @@ -57,8 +57,7 @@ function startPlaying (voiceconnection = discordclientmanager.getDiscordClient() getAudioDispatcher().on("finish", () => { if (isRepeat) { - - log.debug("repeat and sending following payload as reportPlaybackStopped to the server: ",getStopPayload()); + log.debug("repeat and sending following payload as reportPlaybackStopped to the server: ", getStopPayload()); jellyfinClientManager.getJellyfinClient().reportPlaybackStopped(getStopPayload()); startPlaying(voiceconnection, undefined, currentPlayingPlaylistIndex, 0); } else { @@ -69,7 +68,7 @@ function startPlaying (voiceconnection = discordclientmanager.getDiscordClient() stop(undefined, currentPlayingPlaylist[playlistIndex - 1]); } } else { - log.debug("repeat and sending following payload as reportPlaybackStopped to the server: ",getStopPayload()); + log.debug("repeat and sending following payload as reportPlaybackStopped to the server: ", getStopPayload()); jellyfinClientManager.getJellyfinClient().reportPlaybackStopped(getStopPayload()); startPlaying(voiceconnection, undefined, currentPlayingPlaylistIndex + 1, 0); } @@ -82,7 +81,7 @@ function startPlaying (voiceconnection = discordclientmanager.getDiscordClient() } async function spawnPlayMessage (message) { - log.debug("spawned Play Message?: ",typeof message !== "undefined"); + log.debug("spawned Play Message?: ", typeof message !== "undefined"); const itemIdDetails = await jellyfinClientManager.getJellyfinClient().getItem(jellyfinClientManager.getJellyfinClient().getCurrentUserId(), getItemId()); const imageURL = await jellyfinClientManager.getJellyfinClient().getImageUrl(itemIdDetails.AlbumId || getItemId(), { type: "Primary" }); try { @@ -129,7 +128,7 @@ function seek (toSeek = 0) { * @param {Array} itemID - array of itemIDs to be added */ function addTracks (itemID) { - log.debug("added track: ",itemID); + log.debug("added track: ", itemID); currentPlayingPlaylist = currentPlayingPlaylist.concat(itemID); } @@ -141,7 +140,7 @@ function nextTrack () { throw Error("This is the Last song"); } - log.debug("sending following payload as reportPlaybackStopped to the server: ",getStopPayload()); + log.debug("sending following payload as reportPlaybackStopped to the server: ", getStopPayload()); jellyfinClientManager.getJellyfinClient().reportPlaybackStopped(getStopPayload()); startPlaying(undefined, undefined, currentPlayingPlaylistIndex + 1, 0, _disconnectOnFinish); @@ -157,7 +156,7 @@ function previousTrack () { throw Error("This is the First song"); } - log.debug("sending following payload as reportPlaybackStopped to the server: ",getStopPayload()); + log.debug("sending following payload as reportPlaybackStopped to the server: ", getStopPayload()); jellyfinClientManager.getJellyfinClient().reportPlaybackStopped(getStopPayload()); startPlaying(undefined, undefined, currentPlayingPlaylistIndex - 1, 0, _disconnectOnFinish); @@ -168,7 +167,6 @@ function previousTrack () { * @param {Object=} disconnectVoiceConnection - Optional The voice Connection do disconnect from */ function stop (disconnectVoiceConnection, itemId = getItemId()) { - isPaused = true; if (interactivemsghandler.hasMessage()) { interactivemsghandler.destroy(); @@ -176,7 +174,7 @@ function stop (disconnectVoiceConnection, itemId = getItemId()) { if (disconnectVoiceConnection) { disconnectVoiceConnection.disconnect(); } - log.debug("stop playback and send following payload as reportPlaybackStopped to the server: ",getStopPayload()); + log.debug("stop playback and send following payload as reportPlaybackStopped to the server: ", getStopPayload()); jellyfinClientManager.getJellyfinClient().reportPlaybackStopped(getStopPayload()); if (getAudioDispatcher()) { try { diff --git a/src/util.js b/src/util.js index c8e1b6e..acb7d32 100644 --- a/src/util.js +++ b/src/util.js @@ -1,9 +1,6 @@ function checkJellyfinItemIDRegex (strgintomatch) { const regexresult = strgintomatch.match(/([0-9]|[a-f]){32}/); - if(regexresult) - return [regexresult[0]]; - else - return undefined; + if (regexresult) { return [regexresult[0]]; } else { return undefined; } } function ticksToSeconds (ticks) {