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

Merge pull request #523 from zoff-music/feat/added-by-suggest

Browse Source 
Added by on suggested songs
This commit is contained in:
Kasper Rynning-Tønnesen
2019-08-07 16:13:18 +02:00
committed by GitHub
parent ad8bc0c05b 9ed72c0cc0
commit 13bc8cb0ba
4 changed files with 172 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/handlers/aggregates.js
View File

@@ -30,6 +30,7 @@ var project_object = {
duration: 1, duration: 1,
end: 1, end: 1,
type: 1, type: 1,
added_by: { $ifNull: ["$added_by", "Anonymous"] },
source: { $ifNull: ["$source", "youtube"] }, source: { $ifNull: ["$source", "youtube"] },
thumbnail: { thumbnail: {
$ifNull: [ $ifNull: [

11
server/handlers/chat.js
View File

@@ -71,6 +71,16 @@ function getAndSendLogs(channel, all, socket, pass, query) {
}); });
} }
function getUserNameByGuid(guid, callback) {
db.collection("user_names").find({ guid: guid }, function(err, usernames) {
if (usernames.length == 1) {
callback(usernames[0].name);
return;
}
callback("Anonymous");
});
}
function chat(msg, guid, offline, socket) { function chat(msg, guid, offline, socket) {
if ( if (
typeof msg !== "object" || typeof msg !== "object" ||
@@ -909,6 +919,7 @@ function get_name_generate(guid, announce_payload, first, channel) {
}); });
} }
module.exports.getUserNameByGuid = getUserNameByGuid;
module.exports.get_history = get_history; module.exports.get_history = get_history;
module.exports.chat = chat; module.exports.chat = chat;
module.exports.all_chat = all_chat; module.exports.all_chat = all_chat;

305
server/handlers/list_change.js
View File

@@ -2,6 +2,7 @@ var Functions = require(pathThumbnails + "/handlers/functions.js");
var List = require(pathThumbnails + "/handlers/list.js"); var List = require(pathThumbnails + "/handlers/list.js");
var Frontpage = require(pathThumbnails + "/handlers/frontpage.js"); var Frontpage = require(pathThumbnails + "/handlers/frontpage.js");
var Search = require(pathThumbnails + "/handlers/search.js"); var Search = require(pathThumbnails + "/handlers/search.js");
var Chat = require(pathThumbnails + "/handlers/chat.js");
var crypto = require("crypto"); var crypto = require("crypto");
var Filter = require("bad-words"); var Filter = require("bad-words");
var filter = new Filter({ placeHolder: "x" }); var filter = new Filter({ placeHolder: "x" });
@@ -819,159 +820,167 @@ function add_function(arr, coll, guid, offline, socket) {
var source = arr.source; var source = arr.source;
var tags = arr.tags; var tags = arr.tags;
conf = docs; conf = docs;
if ( Chat.getUserNameByGuid(guid, function(username) {
docs !== null && if (
docs.length !== 0 && docs !== null &&
((docs[0].addsongs === true && docs.length !== 0 &&
(hash == docs[0].adminpass || docs[0].adminpass === "")) || ((docs[0].addsongs === true &&
docs[0].addsongs === false) (hash == docs[0].adminpass || docs[0].adminpass === "")) ||
) { docs[0].addsongs === false)
db.collection(coll).find( ) {
{ id: id, type: { $ne: "suggested" } }, db.collection(coll).find(
function(err, docs) { { id: id, type: { $ne: "suggested" } },
if (docs !== null && docs.length === 0) { function(err, docs) {
var guids = [guid]; if (docs !== null && docs.length === 0) {
var added = Functions.get_time(); var guids = [guid];
var votes = 1; var added = Functions.get_time();
db.collection(coll).find({ now_playing: true }, function( var votes = 1;
err, db.collection(coll).find({ now_playing: true }, function(
docs err,
) { docs
if (docs !== null && docs.length === 0) { ) {
np = true; if (docs !== null && docs.length === 0) {
} else { np = true;
np = false;
}
var new_song = {
added: added,
guids: guids,
id: id,
now_playing: np,
title: title,
tags: tags,
votes: votes,
duration: duration,
start: parseInt(start),
end: parseInt(end),
type: "video",
source: source
};
if (source == "soundcloud") {
if (
arr.thumbnail.indexOf("https://i1.sndcdn.com") > -1 ||
arr.thumbnail.indexOf("https://w1.sndcdn.com") > -1
) {
new_song.thumbnail = arr.thumbnail;
} else { } else {
new_song.thumbnail = np = false;
"https://img.youtube.com/vi/404_notfound/mqdefault.jpg";
} }
} else if (source == "youtube") var new_song = {
new_song.thumbnail = added: added,
"https://img.youtube.com/vi/" + guids: guids,
new_song.id + id: id,
"/mqdefault.jpg"; now_playing: np,
db.collection(coll).update( title: title,
{ id: id }, tags: tags,
new_song, votes: votes,
{ upsert: true }, duration: duration,
function(err, docs) { start: parseInt(start),
new_song._id = "asd"; end: parseInt(end),
if (np) { type: "video",
List.send_list(coll, undefined, false, true, false); source: source,
db.collection(coll + "_settings").update( added_by: username
{ id: "config" }, };
{ $set: { startTime: Functions.get_time() } } if (source == "soundcloud") {
); if (
List.send_play(coll, undefined); arr.thumbnail.indexOf("https://i1.sndcdn.com") > -1 ||
var thumbnail = arr.thumbnail.indexOf("https://w1.sndcdn.com") > -1
arr.thumbnail != undefined ) {
? arr.thumbnail new_song.thumbnail = arr.thumbnail;
: undefined;
Frontpage.update_frontpage(
coll,
id,
title,
thumbnail,
arr.source
);
if (source != "soundcloud")
Search.get_correct_info(new_song, coll, false);
else if (source == "soundcloud")
Search.get_genres_soundcloud(new_song, coll);
} else { } else {
io.to(coll).emit("channel", { new_song.thumbnail =
type: "added", "https://img.youtube.com/vi/404_notfound/mqdefault.jpg";
value: new_song
});
if (source != "soundcloud")
Search.get_correct_info(new_song, coll, true);
else if (source == "soundcloud")
Search.get_genres_soundcloud(new_song, coll);
} }
db.collection("frontpage_lists").update( } else if (source == "youtube")
{ _id: coll }, new_song.thumbnail =
{ "https://img.youtube.com/vi/" +
$inc: { count: 1 }, new_song.id +
$set: { accessed: Functions.get_time() } "/mqdefault.jpg";
}, db.collection(coll).update(
{ upsert: true }, { id: id },
function(err, docs) {} new_song,
); { upsert: true },
List.getNextSong(coll, undefined); function(err, docs) {
} new_song._id = "asd";
); if (np) {
socket.emit("toast", "addedsong"); List.send_list(coll, undefined, false, true, false);
}); db.collection(coll + "_settings").update(
} else { { id: "config" },
vote(coll, id, guid, socket); { $set: { startTime: Functions.get_time() } }
} );
} List.send_play(coll, undefined);
); var thumbnail =
} else { arr.thumbnail != undefined
db.collection(coll).find({ id: id }, function(err, docs) { ? arr.thumbnail
if (docs.length === 0) { : undefined;
var suggestedAdd = { Frontpage.update_frontpage(
added: Functions.get_time(), coll,
guids: [guid], id,
id: id, title,
now_playing: false, thumbnail,
title: title, arr.source
votes: 1, );
duration: duration, if (source != "soundcloud")
start: start, Search.get_correct_info(new_song, coll, false);
end: end, else if (source == "soundcloud")
type: "suggested", Search.get_genres_soundcloud(new_song, coll);
tags: tags } else {
}; io.to(coll).emit("channel", {
var source = arr.source; type: "added",
if (source == "soundcloud") { value: new_song
suggestedAdd.thumbnail = arr.thumbnail; });
suggestedAdd.source = source; if (source != "soundcloud")
} else { Search.get_correct_info(new_song, coll, true);
suggestedAdd.source = "youtube"; else if (source == "soundcloud")
} Search.get_genres_soundcloud(new_song, coll);
db.collection(coll).update( }
{ id: id }, db.collection("frontpage_lists").update(
{ $set: suggestedAdd }, { _id: coll },
{ upsert: true }, {
function(err, docs) { $inc: { count: 1 },
socket.emit("toast", "suggested"); $set: { accessed: Functions.get_time() }
var toSend = suggestedAdd; },
toSend.guids = []; { upsert: true },
if (source == "soundcloud") function(err, docs) {}
toSend.thumbnail = arr.thumbnail; );
io.to(coll).emit("suggested", toSend); List.getNextSong(coll, undefined);
}
);
socket.emit("toast", "addedsong");
});
} else {
vote(coll, id, guid, socket);
} }
); }
} else if (docs[0].now_playing === true) { );
socket.emit("toast", "alreadyplay"); } else {
} else { db.collection(coll).find({ id: id }, function(err, docs) {
if (conf[0].vote === false) vote(coll, id, guid, socket); if (docs.length === 0) {
else socket.emit("toast", "listhaspass"); var suggestedAdd = {
} added: Functions.get_time(),
}); guids: [guid],
} id: id,
now_playing: false,
title: title,
votes: 1,
duration: duration,
start: start,
end: end,
type: "suggested",
tags: tags,
added_by: username
};
var source = arr.source;
if (source == "soundcloud") {
suggestedAdd.thumbnail = arr.thumbnail;
suggestedAdd.source = source;
} else {
suggestedAdd.source = "youtube";
}
db.collection(coll).update(
{ id: id },
{ $set: suggestedAdd },
{ upsert: true },
function(err, docs) {
socket.emit("toast", "suggested");
var toSend = suggestedAdd;
toSend.guids = [];
if (source == "soundcloud")
toSend.thumbnail = arr.thumbnail;
io.to(coll).emit("suggested", toSend);
if (source != "soundcloud")
Search.get_correct_info(suggestedAdd, coll, false);
else if (source == "soundcloud")
Search.get_genres_soundcloud(suggestedAdd, coll);
}
);
} else if (docs[0].now_playing === true) {
socket.emit("toast", "alreadyplay");
} else {
if (conf[0].vote === false) vote(coll, id, guid, socket);
else socket.emit("toast", "listhaspass");
}
});
}
});
} else { } else {
if ( if (
(arr.hasOwnProperty("offsiteAdd") && !arr.offsiteAdd) || (arr.hasOwnProperty("offsiteAdd") && !arr.offsiteAdd) ||

7
server/public/assets/js/suggestions.js
View File

@@ -36,10 +36,6 @@ var Suggestions = {
var video_title = params.title; var video_title = params.title;
var date = new Date(params.added * 1000); var date = new Date(params.added * 1000);
var addedTime = var addedTime =
Helper.pad(date.getHours()) +
":" +
Helper.pad(date.getMinutes()) +
" - " +
Helper.pad(date.getDate()) + Helper.pad(date.getDate()) +
"." + "." +
Helper.pad(date.getMonth()) + Helper.pad(date.getMonth()) +
@@ -53,6 +49,9 @@ var Suggestions = {
votes: addedTime, votes: addedTime,
extra: "Added" extra: "Added"
}; };
if (params.added_by != undefined) {
toSend.extra += " by " + params.added_by;
}
if (params.source) toSend.source = params.source; if (params.source) toSend.source = params.source;
else { else {
toSend.source = "youtube"; toSend.source = "youtube";