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 issues with window-history and soundcloud.load function

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-03 19:31:31 +02:00
parent a095e23db0
commit 9442a2093b
12 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/handlers/frontpage.js
View File

@@ -17,11 +17,12 @@ function frontpage_lists(msg, socket) {
}); });
} }
function update_frontpage(coll, id, title, callback) { function update_frontpage(coll, id, title, thumbnail, callback) {
coll = coll.replace(/ /g,''); coll = coll.replace(/ /g,'');
db.collection("frontpage_lists").update({_id: coll}, {$set: { db.collection("frontpage_lists").update({_id: coll}, {$set: {
id: id, id: id,
title: title, title: title,
thumbnail: thumbnail,
accessed: Functions.get_time()} accessed: Functions.get_time()}
},{upsert: true}, function(err, returnDocs){ },{upsert: true}, function(err, returnDocs){
if(typeof(callback) == "function") callback(); if(typeof(callback) == "function") callback();

1
server/handlers/io.js
View File

@@ -471,6 +471,7 @@ module.exports = function() {
socket.on('change_channel', function(obj) socket.on('change_channel', function(obj)
{ {
if(obj == undefined && coll != undefined) { if(obj == undefined && coll != undefined) {
obj = {};
obj.channel = coll; obj.channel = coll;
} else if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){ } else if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
var _list = obj.channel.substring(0, obj.channel.indexOf("?")); var _list = obj.channel.substring(0, obj.channel.indexOf("?"));

4
server/handlers/list.js
View File

@@ -382,7 +382,7 @@ function change_song_post(coll, next_song, callback, socket) {
List.send_play(coll, socket, true); List.send_play(coll, socket, true);
callback(); callback();
} }
Frontpage.update_frontpage(coll, docs[0].id, docs[0].title); Frontpage.update_frontpage(coll, docs[0].id, docs[0].title, docs[0].thumbnail);
}); });
}); });
}); });
@@ -440,7 +440,7 @@ function send_list(coll, socket, send, list_send, configs, shuffled)
skips:[] skips:[]
} }
}, function(err, returnDocs){ }, function(err, returnDocs){
Frontpage.update_frontpage(coll, now_playing_doc[0].id, now_playing_doc[0].title); Frontpage.update_frontpage(coll, now_playing_doc[0].id, now_playing_doc[0].title, now_playing_doc[0].thumbnail);
List.send_list(coll, socket, send, list_send, configs, shuffled); List.send_list(coll, socket, send, list_send, configs, shuffled);
}); });
}); });

5
server/handlers/list_change.js
View File

@@ -88,6 +88,7 @@ function addFromOtherList(arr, guid, offline, socket) {
db.collection(channel).find({now_playing: true}, function(e, np_docs) { db.collection(channel).find({now_playing: true}, function(e, np_docs) {
to_change.id = np_docs[0].id; to_change.id = np_docs[0].id;
to_change.title = np_docs[0].title; to_change.title = np_docs[0].title;
to_change.thumbnail = np_docs[0].thumbnail;
db.collection("frontpage_lists").update({_id: channel}, {$set: to_change}, function(e, d) { db.collection("frontpage_lists").update({_id: channel}, {$set: to_change}, function(e, d) {
List.send_list(channel, undefined, false, true, false); List.send_list(channel, undefined, false, true, false);
List.send_play(channel, undefined); List.send_play(channel, undefined);
@@ -218,6 +219,7 @@ function addPlaylist(arr, guid, offline, socket) {
db.collection(channel).find({now_playing: true}, function(e, np_docs) { db.collection(channel).find({now_playing: true}, function(e, np_docs) {
to_change.id = np_docs[0].id; to_change.id = np_docs[0].id;
to_change.title = np_docs[0].title; to_change.title = np_docs[0].title;
to_change.thumbnail = np_docs[0].thumbnail;
db.collection("frontpage_lists").update({_id: channel}, {$set: to_change}, function(e, d) { db.collection("frontpage_lists").update({_id: channel}, {$set: to_change}, function(e, d) {
List.send_list(channel, undefined, false, true, false); List.send_list(channel, undefined, false, true, false);
List.send_play(channel, undefined); List.send_play(channel, undefined);
@@ -387,7 +389,8 @@ function add_function(arr, coll, guid, offline, socket) {
List.send_list(coll, undefined, false, true, false); List.send_list(coll, undefined, false, true, false);
db.collection(coll + "_settings").update({ id: "config" }, {$set:{startTime: Functions.get_time()}}); db.collection(coll + "_settings").update({ id: "config" }, {$set:{startTime: Functions.get_time()}});
List.send_play(coll, undefined); List.send_play(coll, undefined);
Frontpage.update_frontpage(coll, id, title); var thumbnail = arr.thumbnail != undefined ? arr.thumbnail : undefined;
Frontpage.update_frontpage(coll, id, title, thumbnail);
if(source != "soundcloud") Search.get_correct_info(new_song, coll, false); if(source != "soundcloud") Search.get_correct_info(new_song, coll, false);
} else { } else {
io.to(coll).emit("channel", {type: "added", value: new_song}); io.to(coll).emit("channel", {type: "added", value: new_song});

1
server/public/assets/js/embed.js
View File

@@ -8,6 +8,7 @@ var startTime = 0;
var socket_connected = false; var socket_connected = false;
var dynamicListeners = {}; var dynamicListeners = {};
var player_ready = false; var player_ready = false;
var soundcloud_loading = false;
var firstLoad = ""; var firstLoad = "";
var list_html = document.getElementById("list-song-html").innerHTML; var list_html = document.getElementById("list-song-html").innerHTML;
var w_p = true; var w_p = true;

2
server/public/assets/js/frontpage.js
View File

@@ -80,7 +80,7 @@ var Frontpage = {
var description = lists[x].description; var description = lists[x].description;
var img; var img;
if(id.indexOf("soundcloud.com") > -1) { if(id.indexOf("soundcloud.com") > -1) {
img = "background-image:url('http://icons.iconarchive.com/icons/uiconstock/socialmedia/128/Soundcloud-icon.png');"; img = "background-image:url('" + lists[x].thumbnail + "');";
} else { } else {
img = "background-image:url('https://img.youtube.com/vi/"+id+"/hqdefault.jpg');"; img = "background-image:url('https://img.youtube.com/vi/"+id+"/hqdefault.jpg');";
if(lists[x].thumbnail) { if(lists[x].thumbnail) {

1
server/public/assets/js/listeners.js
View File

@@ -12,6 +12,7 @@ var videoSource;
var dynamicListeners = {}; var dynamicListeners = {};
var socket_connected = false; var socket_connected = false;
var hasadmin = 0; var hasadmin = 0;
var soundcloud_loading = false;
var list_html = document.querySelectorAll("#list-song-html").length > 0 ? document.querySelector("#list-song-html").innerHTML : undefined; var list_html = document.querySelectorAll("#list-song-html").length > 0 ? document.querySelector("#list-song-html").innerHTML : undefined;
var unseen = false; var unseen = false;
var searching = false; var searching = false;

100
server/public/assets/js/player.js
View File

@@ -446,34 +446,35 @@ var Player = {
console.log(Player.soundcloud_player.src.indexOf(id), seekTo); console.log(Player.soundcloud_player.src.indexOf(id), seekTo);
Player.stopVideo(); Player.stopVideo();
Helper.removeClass(document.getElementById("player_overlay"), "hide"); Helper.removeClass(document.getElementById("player_overlay"), "hide");
document.getElementById("player_overlay_text").innerText = "Loading SoundCloud";
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d"); Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
if(Player.soundcloud_player.src.indexOf(id) > -1) { if(Player.soundcloud_player.src.indexOf(id) > -1) {
console.log("seekto " + seekTo + " start " + start); console.log("seekto " + seekTo + " start " + start);
if(start == undefined) start = 0; if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0; if(seekTo == undefined) seekTo = 0;
SC.Widget(Player.soundcloud_player).seekTo((start + seekTo) * 1000); SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
} else { } else {
SC.Widget(Player.soundcloud_player).load(id, { console.log("loaded here");
auto_play: true, document.querySelector("#soundcloud_container").innerHTML = '<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;" \
buying:false, src="https://w.soundcloud.com/player/?url=' + id + '&auto_play=true&buying=false&sharing=false&download=false&show_user=false"> \
sharing:false, </iframe>';
download:false, Player.soundcloud_player = document.querySelector("#soundcloud_player");
show_user:false, soundcloud_loading = true;
callback: function() { SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
Player.stopVideo(); SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause);
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume()); SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay);
console.log(start, seekTo); SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
if(start == undefined) start = 0; console.log(start, seekTo);
if(seekTo == undefined) seekTo = 0; if(start == undefined) start = 0;
SC.Widget(Player.soundcloud_player).seekTo((start + seekTo) * 1000); if(seekTo == undefined) seekTo = 0;
Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')");
Helper.css(document.getElementById("player_overlay"), "background-size", "auto"); SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
Helper.addClass("#player_overlay_text", "hide");
}
});
} }
Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')");
Helper.css(document.getElementById("player_overlay"), "background-size", "auto");
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
Helper.addClass("#player_overlay_text", "hide");
//SC.Widget(Player.soundcloud_player).play(); //SC.Widget(Player.soundcloud_player).play();
} else { } else {
//window.player = Player.player; //window.player = Player.player;
@@ -498,27 +499,46 @@ var Player = {
else e = Player.np.end; else e = Player.np.end;
if(videoSource == "soundcloud") { if(videoSource == "soundcloud") {
Helper.removeClass(document.getElementById("player_overlay"), "hide"); if(videoSource == "soundcloud") {
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d"); console.log(Player.soundcloud_player.src.indexOf(id), seekTo);
SC.Widget(Player.soundcloud_player).load(id, { Player.stopVideo();
auto_play: false, Helper.removeClass(document.getElementById("player_overlay"), "hide");
buying:false, document.getElementById("player_overlay_text").innerText = "Loading SoundCloud";
sharing:false, Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
download:false, if(Player.soundcloud_player.src.indexOf(id) > -1) {
show_user:false, console.log("seekto " + seekTo + " start " + start);
callback: function() { if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
} else {
console.log("loaded here");
document.querySelector("#soundcloud_container").innerHTML = '<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;" \
src="https://w.soundcloud.com/player/?url=' + id + '&auto_play=false&buying=false&sharing=false&download=false&show_user=false"> \
</iframe>';
Player.soundcloud_player = document.querySelector("#soundcloud_player");
soundcloud_loading = true;
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay);
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume()); SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
console.log(start, seekTo); console.log(start, seekTo);
if(start == undefined) start = 0; if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0; if(seekTo == undefined) seekTo = 0;
SC.Widget(Player.soundcloud_player).seekTo((start + seekTo) * 1000); SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')");
Helper.css(document.getElementById("player_overlay"), "background-size", "cover");
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
Helper.addClass("#player_overlay_text", "hide");
} }
}); Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')");
Helper.css(document.getElementById("player_overlay"), "background-size", "auto");
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
Helper.addClass("#player_overlay_text", "hide");
//SC.Widget(Player.soundcloud_player).play();
} else {
//window.player = Player.player;
Helper.addClass(document.getElementById("player_overlay"), "hide");
Helper.css(document.getElementById("player_overlay"), "background", "none");
Helper.removeClass("#player_overlay_text", "hide");
Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
}
} else { } else {
Player.player.cueVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e}); Player.player.cueVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
} }
@@ -708,8 +728,13 @@ var Player = {
soundcloudPlay: function() { soundcloudPlay: function() {
console.log("playing"); console.log("playing");
console.log(videoSource, soundcloud_loading);
if(videoSource == "youtube") { if(videoSource == "youtube") {
SC.Widget(Player.soundcloud_player).pause(); SC.Widget(Player.soundcloud_player).pause();
} else if(soundcloud_loading){
SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
console.log("We need to skip !", Player.np.start, seekTo)
soundcloud_loading = false;
} }
if(embed) { if(embed) {
Helper.css("#player", "visibility", "visible"); Helper.css("#player", "visibility", "visible");
@@ -931,6 +956,7 @@ var Player = {
} else { } else {
currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo; currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo;
} }
console.log(Player.np.start, currDurr, Player.np.end);
if(currDurr - Player.np.start > duration && !offline) { if(currDurr - Player.np.start > duration && !offline) {
currDurr = duration - Player.np.start; currDurr = duration - Player.np.start;
} }

8
server/public/layouts/client/embed.handlebars
View File

@@ -12,9 +12,11 @@
<div id="player"></div> <div id="player"></div>
<div id="player_overlay" class="hide valign-wrapper"> <div id="player_overlay" class="hide valign-wrapper">
</div> </div>
<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="top: 0px; left:0px; visibility: hidden;z-index: -999;position: absolute;pointer-events: none;" <div id="soundcloud_container">
src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/undefined&amp;{ auto_play: false, buying:false, sharing:false, download:false, show_user:false, }"> <iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="top: 0px; left:0px; visibility: hidden;z-index: -999;position: absolute;pointer-events: none;"
</iframe> src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/undefined&amp;{ auto_play: false, buying:false, sharing:false, download:false, show_user:false, }">
</iframe>
</div>
<div id="zoffbutton" title="Visit the channel!"></div> <div id="zoffbutton" title="Visit the channel!"></div>
<div id="controls" class="noselect"> <div id="controls" class="noselect">
<div id="playpause"> <div id="playpause">

8
server/public/partials/channel/players.handlebars
View File

@@ -3,9 +3,11 @@
<div id="fireplace_player" class="ytplayer"></div> <div id="fireplace_player" class="ytplayer"></div>
{{/unless}} {{/unless}}
<div id="player" class="ytplayer"></div> <div id="player" class="ytplayer"></div>
<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;" <div id="soundcloud_container">
src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/undefined&amp;{ auto_play: false, buying:false, sharing:false, download:false, show_user:false, }"> <iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;"
</iframe> src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/undefined&amp;{ auto_play: false, buying:false, sharing:false, download:false, show_user:false, }">
</iframe>
</div>
<div id="main_components"> <div id="main_components">
<div id="player_overlay" class="hide valign-wrapper"> <div id="player_overlay" class="hide valign-wrapper">
<div id="playing_on"> <div id="playing_on">

2
server/public/partials/donate.handlebars
View File

@@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="col s12 m6 center"> <div class="col s12 m6 center">
<div class="col s12 center"> <div class="col s12 center">
<img src="https://en.bitcoin.it/w/images/en/c/cb/BC_Logotype.png" alt="bitcoin-image" class="col s6 center"/> <img src="/assets/images/btcdonate.png" alt="bitcoin-image" class="col s6 center"/>
<input type="text" id="bitcoin-address" readonly value="18DxBV9ij9t1eSLC3rTrugJbzGtMVPEyNB" /> <input type="text" id="bitcoin-address" readonly value="18DxBV9ij9t1eSLC3rTrugJbzGtMVPEyNB" />
</div> </div>
<div class="col s12 center"> <div class="col s12 center">

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

@@ -751,7 +751,8 @@ router.route('/api/list/:channel_name/:video_id').post(function(req,res) {
postEnd(channel_name, configs, new_song, guid, res, authenticated, authorized); postEnd(channel_name, configs, new_song, guid, res, authenticated, authorized);
}); });
} else if(set_np) { } else if(set_np) {
Frontpage.update_frontpage(channel_name, video_id, title, function() { var thumbnail = req.body.thumbnail != undefined ? req.body.thumbnail : undefined;
Frontpage.update_frontpage(channel_name, video_id, title, thumbnail, function() {
io.to(channel_name).emit("np", {np: [new_song], conf: [conf]}); io.to(channel_name).emit("np", {np: [new_song], conf: [conf]});
postEnd(channel_name, configs, new_song, guid, res, authenticated, authorized); postEnd(channel_name, configs, new_song, guid, res, authenticated, authorized);
}); });