From 8db1e5fd32a62dfa02574e46e2310f03cc787b02 Mon Sep 17 00:00:00 2001 From: Devoxin Date: Thu, 7 Dec 2017 00:08:49 +0000 Subject: [PATCH 1/2] Lint fixes and minor improvements --- index.js | 60 +++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/index.js b/index.js index 274af21..4a0c4d4 100644 --- a/index.js +++ b/index.js @@ -1,14 +1,14 @@ const DiscordRPC = require('discord-rpc'), - nodeSpotifyWebhelper = require('node-spotify-webhelper'), - spotify = new nodeSpotifyWebhelper.SpotifyWebHelper(), - config = require('./config.json'); + nodeSpotifyWebhelper = require('node-spotify-webhelper'), + spotify = new nodeSpotifyWebhelper.SpotifyWebHelper(), + config = require('./config.json'); -const ClientId = config.clientId || "384286107036155904"; -const imageKey = config.largeImageKey || "spotify"; +const ClientId = config.clientId || '384286107036155904'; +const imageKey = config.largeImageKey || 'spotify'; const imageText = config.largeImageText || undefined; const rpc = new DiscordRPC.Client({ - transport: 'ipc' + transport: 'ipc' }); const timeMode = config.time || 'overall'; @@ -16,35 +16,33 @@ var startTimestamp = new Date(); var songName = undefined; async function updateActivity() { - if (!rpc) return; - if (startTimestamp && config.time === 'none') startTimestamp = undefined; + if (!rpc) return; + if (startTimestamp && timeMode === 'none') startTimestamp = undefined; - spotify.getStatus(function(err, res) { - if (err) return console.error(err); - if (res.track.track_resource && res.track.track_resource.name && res.track.track_resource.name != songName) { - if (config.time === 'song-time') { - startTimestamp = new Date(new Date() - (res.playing_position * 1000)); - } - songName = res.track.track_resource.name; - rpc.setActivity({ - details: `Playing ${res.track.track_resource.name}`, - state: `By ${res.track.artist_resource.name}`, - startTimestamp, - largeImageKey: imageKey, - largeImageText: imageText, - instance: false, - }); - console.log(`[${new Date().toLocaleTimeString()}] Updated Rich Presence - ${res.track.track_resource.name}`) - } - }) + spotify.getStatus((err, res) => { + if (err) return console.error(err); + if (res.track.track_resource && res.track.track_resource.name && res.track.track_resource.name !== songName) { + if (timeMode === 'song-time') { + startTimestamp = new Date(new Date() - res.playing_position * 1000); + } + songName = res.track.track_resource.name; + rpc.setActivity({ + details: `Playing ${res.track.track_resource.name}`, + state: `By ${res.track.artist_resource.name}`, + startTimestamp, + largeImageKey: imageKey, + largeImageText: imageText, + instance: false, + }); + console.log(`[${new Date().toLocaleTimeString()}] Updated Rich Presence - ${res.track.track_resource.name}`); + } + }); } rpc.on('ready', () => { - console.log(`Starting with clientId ${ClientId}`); - updateActivity(); - setInterval(() => { - updateActivity(); - }, 10e3); + console.log(`Starting with clientId ${ClientId}`); + updateActivity(); + setInterval(updateActivity, 10e3); }); rpc.login(ClientId).catch(console.error); From 181bee723582f11b3be952811822f9fb4ec9aa43 Mon Sep 17 00:00:00 2001 From: Devoxin Date: Thu, 7 Dec 2017 00:09:08 +0000 Subject: [PATCH 2/2] Use 15 seconds per RPC ratelimit --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4a0c4d4..2ce0a0c 100644 --- a/index.js +++ b/index.js @@ -42,7 +42,7 @@ async function updateActivity() { rpc.on('ready', () => { console.log(`Starting with clientId ${ClientId}`); updateActivity(); - setInterval(updateActivity, 10e3); + setInterval(updateActivity, 15e3); }); rpc.login(ClientId).catch(console.error);