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

offline and color fixes

Browse Source 
- ColorThief on soundcloud images
- Video title now working on offline instantiated player
- Green connected toast on connected
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-24 13:22:29 +02:00
parent 0531c65ee2
commit 120b3a0676
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/handlers/list.js
View File

@@ -612,9 +612,13 @@ function send_play(coll, socket, broadcast) {
io.to(coll).emit("np", toSend);
//
List.getNextSong(coll)
sendColor(coll, false, np[0].id);
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);
} else {
sendColor(coll, socket, np[0].id);
var url = 'https://img.youtube.com/vi/'+np[0].id+'/mqdefault.jpg';
if(np[0].source == "soundcloud") url = np[0].thumbnail;
sendColor(coll, socket, url);
if(broadcast) {
socket.to(coll).emit("np", toSend);
return;
@@ -637,11 +641,13 @@ function send_play(coll, socket, broadcast) {
});
}
function sendColor(coll, socket, id, ajax, res) {
function sendColor(coll, socket, url, ajax, res) {
if(coll != undefined && typeof(coll) == "string") {
coll = coll.replace(/ /g,'');
}
var url = 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg';
if(url.indexOf("://") == -1) url = 'https://img.youtube.com/vi/'+url+'/mqdefault.jpg';
//var url = 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg';
Jimp.read(url).then(function (image) {
var c = ColorThief.getColor(image);