diff --git a/fgfm.TODO b/fgfm.TODO index 6548e0b..d226d15 100755 --- a/fgfm.TODO +++ b/fgfm.TODO @@ -1,5 +1,7 @@ TODO: - ☐ Add cooldowns + ✔ Add cooldowns @done (18-10-02 10:16) + ☐ Move anything that calls director.state from app into fgfm lib + ☐ Restrict # of requests a user can have in the queue at once ☐ Move vrmode timer to this bot, delete from SLCB ☐ Support a CLI flag to delay showing queue until command is issued ☐ Room vid requests / import @@ -11,7 +13,6 @@ TODO: ☐ Remove currently playing video from vote choices ☐ Command to add sets of videos to the queue at once (like the entire ttas or all gold segments) ☐ Command to stop video rotation / timers (shutdown) - ☐ Restrict # of requests a user can have in the queue at once ☐ Start/stop stream automation ☐ Start - Starting Soon is shown until countdown is triggered diff --git a/fgfm.js b/fgfm.js index d927def..9dcdf54 100755 --- a/fgfm.js +++ b/fgfm.js @@ -267,13 +267,13 @@ const streamInit = (config, twitch) => { current: (cmd) => { - // @TODO: Move into FGFM + // @TODO: Move retrieval of currentVideo into FGFM twitch.botChat.say(cmd.to, `Now Playing: ${director.state.currentVideo.chatName}`); }, next: (cmd) => { - // @TODO: Move into FGFM + // @TODO: Move retrieval of videoQueue into FGFM if (director.state.videoQueue.length > 0) { twitch.botChat.say(cmd.to, `Next Video: ${director.state.videoQueue[0].chatName}`); } else { @@ -290,7 +290,7 @@ const streamInit = (config, twitch) => { } // make sure request vid isn't in the queue already - // @TODO: Move into FGFM + // @TODO: Move check into FGFM if (director.state.videoQueue.findIndex(e => e.id === requestedVideoId) !== -1) { twitch.botChat.say(cmd.to, `That video is in the queue already!`); return; @@ -303,6 +303,8 @@ const streamInit = (config, twitch) => { return; } + // @TODO: Make sure user hasn't met the request limit + config.vods.alttp[vodIndex].requestedBy = cmd.from; // add to queue if it exists @@ -333,6 +335,8 @@ const streamInit = (config, twitch) => { return; } + // @TODO: Make sure user hasn't met the request limit + room.requestedBy = cmd.from; director.addRoomVideo(room); diff --git a/sfx/enjoy.mp3 b/sfx/enjoy.mp3 new file mode 100755 index 0000000..ccbb15e Binary files /dev/null and b/sfx/enjoy.mp3 differ diff --git a/sfx/gtt.mp3 b/sfx/gtt.mp3 new file mode 100755 index 0000000..90aaab1 Binary files /dev/null and b/sfx/gtt.mp3 differ diff --git a/sfx/hamlaugh2.mp3 b/sfx/hamlaugh2.mp3 new file mode 100755 index 0000000..e79cae0 Binary files /dev/null and b/sfx/hamlaugh2.mp3 differ