KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now sending next song when asked to correctly, and to only the askee

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-06-23 13:30:00 +02:00
parent 8139f786ec
commit 5af7fe2d37
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/handlers/list.js
View File

@@ -651,7 +651,7 @@ function send_play(coll, socket, broadcast) {
if(socket === undefined) {
io.to(coll).emit("np", toSend);
//
getNextSong(coll)
getNextSong(coll, undefined)
var url = 'https://img.youtube.com/vi/'+np[0].id+'/mqdefault.jpg';
if(np[0].source == "soundcloud") url = np[0].thumbnail;
sendColor(coll, false, url);
@@ -713,7 +713,7 @@ function sendColor(coll, socket, url, ajax, res) {
});
}
function getNextSong(coll, callback) {
function getNextSong(coll, socket, callback) {
//coll = coll.replace(/ /g,'');
db.collection(coll).aggregate([{
$match:{
@@ -741,7 +741,11 @@ function getNextSong(coll, callback) {
source = "soundcloud";
thumbnail = doc[0].thumbnail;
}
io.to(coll).emit("next_song", {videoId: doc[0].id, title: doc[0].title, source: source, thumbnail: thumbnail});
if(socket != undefined) {
socket.emit("next_song", {videoId: doc[0].id, title: doc[0].title, source: source, thumbnail: thumbnail});
} else {
io.to(coll).emit("next_song", {videoId: doc[0].id, title: doc[0].title, source: source, thumbnail: thumbnail});
}
}
if(typeof(callback) == "function") callback();
});