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

Fixed issue with correct title not returning result

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-03 12:12:32 +01:00
parent fa7071ecb6
commit 740cf021f8
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/handlers/search.js
View File

@@ -45,16 +45,24 @@ function get_correct_info(song_generated, channel, broadcast, callback) {
io.to(channel).emit("channel", {type: "changed_values", value: song_generated}); io.to(channel).emit("channel", {type: "changed_values", value: song_generated});
} }
} else { } else {
if(typeof(callback) == "function") {
callback(song_generated, true); callback(song_generated, true);
} }
}
}); });
} else {
if(typeof(callback) == "function") {
callback(song_generated, true);
}
} }
} else { } else {
findSimilar(song_generated, channel, broadcast, callback) findSimilar(song_generated, channel, broadcast, callback)
} }
} catch(e){ } catch(e){
if(typeof(callback) == "function") {
callback({}, false); callback({}, false);
} }
}
}); });
} }
@@ -123,7 +131,7 @@ function findSimilar(msg, channel, broadcast, callback) {
io.to(channel).emit("channel", {type: "changed_values", value: element}); io.to(channel).emit("channel", {type: "changed_values", value: element});
} }
} }
if(callback) { if(typeof(callback) == "function") {
msg.title = element.title; msg.title = element.title;
msg.id = element.id; msg.id = element.id;
msg.duration = element.duration; msg.duration = element.duration;
@@ -132,7 +140,7 @@ function findSimilar(msg, channel, broadcast, callback) {
callback(msg, true); callback(msg, true);
} }
}); });
} else if(callback) { } else if(typeof(callback) == "function") {
callback({}, false); callback({}, false);
} }
}); });

1
server/routing/client/api.js
View File

@@ -381,7 +381,6 @@ router.route('/api/list/:channel_name/:video_id').post(function(req,res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
var fetch_only = false; var fetch_only = false;
if(req.body.hasOwnProperty('fetch_song')) { if(req.body.hasOwnProperty('fetch_song')) {
fetch_only = true; fetch_only = true;