KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 09:50:24 +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,
end: 1,
type: 1,
added_by: { $ifNull: ["$added_by", "Anonymous"] },
source: { $ifNull: ["$source", "youtube"] },
thumbnail: {
$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) {
if (
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.chat = 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 Frontpage = require(pathThumbnails + "/handlers/frontpage.js");
var Search = require(pathThumbnails + "/handlers/search.js");
var Chat = require(pathThumbnails + "/handlers/chat.js");
var crypto = require("crypto");
var Filter = require("bad-words");
var filter = new Filter({ placeHolder: "x" });
@@ -819,159 +820,167 @@ function add_function(arr, coll, guid, offline, socket) {
var source = arr.source;
var tags = arr.tags;
conf = docs;
if (
docs !== null &&
docs.length !== 0 &&
((docs[0].addsongs === true &&
(hash == docs[0].adminpass || docs[0].adminpass === "")) ||
docs[0].addsongs === false)
) {
db.collection(coll).find(
{ id: id, type: { $ne: "suggested" } },
function(err, docs) {
if (docs !== null && docs.length === 0) {
var guids = [guid];
var added = Functions.get_time();
var votes = 1;
db.collection(coll).find({ now_playing: true }, function(
err,
docs
) {
if (docs !== null && docs.length === 0) {
np = true;
} else {
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;
Chat.getUserNameByGuid(guid, function(username) {
if (
docs !== null &&
docs.length !== 0 &&
((docs[0].addsongs === true &&
(hash == docs[0].adminpass || docs[0].adminpass === "")) ||
docs[0].addsongs === false)
) {
db.collection(coll).find(
{ id: id, type: { $ne: "suggested" } },
function(err, docs) {
if (docs !== null && docs.length === 0) {
var guids = [guid];
var added = Functions.get_time();
var votes = 1;
db.collection(coll).find({ now_playing: true }, function(
err,
docs
) {
if (docs !== null && docs.length === 0) {
np = true;
} else {
new_song.thumbnail =
"https://img.youtube.com/vi/404_notfound/mqdefault.jpg";
np = false;
}
} else if (source == "youtube")
new_song.thumbnail =
"https://img.youtube.com/vi/" +
new_song.id +
"/mqdefault.jpg";
db.collection(coll).update(
{ id: id },
new_song,
{ upsert: true },
function(err, docs) {
new_song._id = "asd";
if (np) {
List.send_list(coll, undefined, false, true, false);
db.collection(coll + "_settings").update(
{ id: "config" },
{ $set: { startTime: Functions.get_time() } }
);
List.send_play(coll, undefined);
var thumbnail =
arr.thumbnail != undefined
? 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);
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,
added_by: username
};
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 {
io.to(coll).emit("channel", {
type: "added",
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);
new_song.thumbnail =
"https://img.youtube.com/vi/404_notfound/mqdefault.jpg";
}
db.collection("frontpage_lists").update(
{ _id: coll },
{
$inc: { count: 1 },
$set: { accessed: Functions.get_time() }
},
{ upsert: true },
function(err, docs) {}
);
List.getNextSong(coll, undefined);
}
);
socket.emit("toast", "addedsong");
});
} else {
vote(coll, id, guid, socket);
}
}
);
} else {
db.collection(coll).find({ id: id }, function(err, docs) {
if (docs.length === 0) {
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
};
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);
} else if (source == "youtube")
new_song.thumbnail =
"https://img.youtube.com/vi/" +
new_song.id +
"/mqdefault.jpg";
db.collection(coll).update(
{ id: id },
new_song,
{ upsert: true },
function(err, docs) {
new_song._id = "asd";
if (np) {
List.send_list(coll, undefined, false, true, false);
db.collection(coll + "_settings").update(
{ id: "config" },
{ $set: { startTime: Functions.get_time() } }
);
List.send_play(coll, undefined);
var thumbnail =
arr.thumbnail != undefined
? 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 {
io.to(coll).emit("channel", {
type: "added",
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(
{ _id: coll },
{
$inc: { count: 1 },
$set: { accessed: Functions.get_time() }
},
{ upsert: true },
function(err, docs) {}
);
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 {
if (conf[0].vote === false) vote(coll, id, guid, socket);
else socket.emit("toast", "listhaspass");
}
});
}
}
);
} else {
db.collection(coll).find({ id: id }, function(err, docs) {
if (docs.length === 0) {
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 {
if (
(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 date = new Date(params.added * 1000);
var addedTime =
Helper.pad(date.getHours()) +
":" +
Helper.pad(date.getMinutes()) +
" - " +
Helper.pad(date.getDate()) +
"." +
Helper.pad(date.getMonth()) +
@@ -53,6 +49,9 @@ var Suggestions = {
votes: addedTime,
extra: "Added"
};
if (params.added_by != undefined) {
toSend.extra += " by " + params.added_by;
}
if (params.source) toSend.source = params.source;
else {
toSend.source = "youtube";