Added by on suggested songs

Other channel is the counter and deciding part

server/handlers/aggregates.js

@@ -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: [

server/handlers/chat.js

@@ -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;

server/handlers/list_change.js

@@ -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" });
@@ -201,7 +202,7 @@ function addFromOtherList(arr, guid, offline, socket) {
                                                             accessed: Functions.get_time()
                                                           };
                                                           db.collection(
-                                                            channel
+                                                            new_channel
                                                           ).find(
                                                             {
                                                               now_playing: true
@@ -819,6 +820,7 @@ function add_function(arr, coll, guid, offline, socket) {
           var source = arr.source;
           var tags = arr.tags;
           conf = docs;
+          Chat.getUserNameByGuid(guid, function(username) {
             if (
               docs !== null &&
               docs.length !== 0 &&
@@ -854,7 +856,8 @@ function add_function(arr, coll, guid, offline, socket) {
                         start: parseInt(start),
                         end: parseInt(end),
                         type: "video",
-                      source: source
+                        source: source,
+                        added_by: username
                       };
                       if (source == "soundcloud") {
                         if (
@@ -942,7 +945,8 @@ function add_function(arr, coll, guid, offline, socket) {
                     start: start,
                     end: end,
                     type: "suggested",
-                  tags: tags
+                    tags: tags,
+                    added_by: username
                   };
                   var source = arr.source;
                   if (source == "soundcloud") {
@@ -962,6 +966,10 @@ function add_function(arr, coll, guid, offline, socket) {
                       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) {
@@ -972,6 +980,7 @@ function add_function(arr, coll, guid, offline, socket) {
                 }
               });
             }
+          });
         } else {
           if (
             (arr.hasOwnProperty("offsiteAdd") && !arr.offsiteAdd) ||

server/public/assets/js/channel.js

@@ -3,10 +3,6 @@ var Channel = {
     if (window.location.hash == "#small" || inIframe()) {
       small_player = true;
       document.querySelector("footer").style.display = "none";
-      //addJoinBox();
-      //hideAllExtra();
-      //document.querySelectorAll(".tab.col.s3")[1].remove();
-      //document.querySelectorAll(".tab.col.s3")[1].remove();
     }
     if (client) {
       Helper.addClass(".tabs", "hide");
@@ -25,12 +21,7 @@ var Channel = {
       Helper.addClass(".control-list", "client-control-list");
     } else {
       if (!api_key.hasOwnProperty("soundcloud")) soundcloud_enabled = false;
-      else {
+
-        /*SC.initialize({
-                  client_id: api_key.soundcloud
-                }, function() {
-                });*/
-      }
       if (cast_ready_connect || chromecastAvailable || chromecastReady) {
         Helper.addClass(".volume-container", "volume-container-cast");
       }
@@ -295,10 +286,13 @@ var Channel = {
 
     if (!client) {
       if (!Helper.mobilecheck()) {
+        var port = window.location.port;
+        if (port != "") port = ":" + port;
         var shareCodeUrl =
           window.location.protocol +
           "//client." +
           window.location.hostname +
+          port +
           "/r/" +
           btoa(encodeURIComponent(chan.toLowerCase()));
         document
@@ -312,18 +306,11 @@ var Channel = {
           "#channel-name-join",
           "client." +
             window.location.hostname +
+            port +
             "/" +
             encodeURIComponent(chan.toLowerCase())
         );
-      } /*else if(small_player) {
-                document.querySelector("#channel-share-modal .modal-content").innerHTML = "<p>To listen to this channel with more features, go to</p><p>https://zoff.me/" + encodeURIComponent(chan.toLowerCase()) + "</p><img src='/assets/images/favicon.png' height='100' width='100' alt='circle-logo-zoff'>";
-                //M.Modal.getInstance(document.getElementById("channel-share-modal")).open();
-                if(!Helper.mobilecheck()) {
-                    setTimeout(function() {
-                        M.Modal.getInstance(document.getElementById("channel-share-modal")).close();
-                    }, 10000);
       }
-            }*/
     } else {
       Helper.removeElement(".video-container");
       Helper.removeElement(".offline-panel");
@@ -435,24 +422,6 @@ var Channel = {
         position: "top",
         html: "Cast Zoff to TV"
       });
-
-      /*$("#color_embed").spectrum({
-                color: "#808080",
-                change: function(c) {
-                    color = c.toHexString().substring(1); // #ff0000
-                    document.getElementById("embed-area").value = embed_code(embed_autoplay, embed_width, embed_height, color);
-                },
-                appendTo: "#embed",
-                containerClassName: 'polyfill-color z-depth-4',
-                show: function(color) {
-                },
-            });*/
-
-      /*Helper.addClass(".sp-choose", "hide");
-            Helper.addClass(".sp-cancel", "btn-flat waves-effect waves-red");
-            Helper.removeClass(".sp-cancel", "sp-cancel");
-            document.getElementsByClassName("sp-button-container")[0].insertAdjacentHTML("beforeend", "<a href='#' class='btn-flat waves-effect waves-green sp-choose-link'>CHOOSE</a>");
-            */
     }
 
     addListener("click", ".sp-choose-link", function(e) {
@@ -708,10 +677,6 @@ var Channel = {
         channel: add + chan.toLowerCase()
       });
     } else if (url_split[3] === "") {
-      /*if(client) {
-                var host = window.location.hostname.split(".");
-                window.location.hostname = host[host.length -1];
-            }*/
       Admin.display_logged_out();
       if (hostMode) {
         Helper.removeClass("#main-row", "fullscreened");

server/public/assets/js/hostcontroller.js

@@ -13,11 +13,7 @@ var Hostcontroller = {
       Hostcontroller.old_id = id;
     }
     var codeURL =
-      window.location.protocol +
+      window.location.protocol + "//remote." + window.location.host + "/" + id;
-      "//remote." +
-      window.location.hostname +
-      "/" +
-      id;
     if (embed) {
       if (window.parentWindow && window.parentOrigin) {
         window.parentWindow.postMessage(

server/public/assets/js/remotecontroller.js

@@ -32,11 +32,8 @@ window.addEventListener(
     M.Modal.init(document.getElementById("about"));
     M.Modal.init(document.getElementById("contact"));
     M.Modal.init(document.getElementById("help"));
-
-    if (window.location.hostname == "remote.zoff.me") add = "https://zoff.me";
-    else add = "localhost";
     socket = io.connect(
-      add,
+      window.location.protocol + "//" + window.location.host,
       connection_options
     );
     socket.on("update_required", function() {

server/public/assets/js/suggestions.js

@@ -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";
@@ -89,7 +88,7 @@ var Suggestions = {
       "&type=video&key=" +
       api_key.youtube;
     var video_urls =
-      "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id,statistics&fields=pageInfo,items(id,contentDetails,snippet(categoryId,channelTitle,publishedAt,title,description,thumbnails))&key=" +
+      "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id,statistics&fields=pageInfo,items(id,contentDetails,statistics(viewCount),snippet(categoryId,channelTitle,publishedAt,title,description,thumbnails))&key=" +
       api_key.youtube +
       "&id=";
 
@@ -125,13 +124,11 @@ var Suggestions = {
               try {
                 viewCount = song.statistics.viewCount
                   .toString()
-                  .replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+                  .replace(/\B(?=(\d{3})+(?!\d))/g, " ");
               } catch (e) {}
 
               try {
-                document
+                document.getElementById("suggest-song-html").insertAdjacentHTML(
-                  .getElementById("suggest-song-html")
-                  .insertAdjacentHTML(
                   "beforeend",
                   List.generateSong(
                     {

server/routing/client/router.js

@@ -13,7 +13,6 @@ var Functions = require(pathThumbnails + "/handlers/functions.js");
 var Frontpage = require(pathThumbnails + "/handlers/frontpage.js");
 
 var db = require(pathThumbnails + "/handlers/db.js");
-//var db = require(pathThumbnails + '/handlers/db.js');
 
 try {
   google = require(path.join(
@@ -168,10 +167,6 @@ function root(req, res, next) {
     var subdomain = req.headers["x-forwarded-host"]
       ? req.headers["x-forwarded-host"].split(".")
       : req.headers.host.split(":")[0].split(".");
-    /*if(url != "zoff.me" && url != "admin.localhost" && url != "admin.zoff.me" && url != "remote.zoff.me" && url != "fb.zoff.me" && url != "remote.localhost" && url != "localhost") {
-            res.redirect("https://zoff.me");
-            return;
-        }*/
     if (subdomain[0] == "remote") {
       var data = {
         year: year,
@@ -228,7 +223,6 @@ function root(req, res, next) {
     }
   } catch (e) {
     console.log(e);
-    //res.redirect("https://zoff.me");
   }
 }
 
@@ -240,10 +234,6 @@ function channel(req, res, next) {
     var subdomain = req.headers["x-forwarded-host"]
       ? req.headers["x-forwarded-host"].split(".")
       : req.headers.host.split(":")[0].split(".");
-    /*if(url != "zoff.me" && url != "admin.localhost" && url != "admin.zoff.me" && url != "remote.zoff.me" && url != "fb.zoff.me" && url != "remote.localhost" && url != "localhost") {
-            res.redirect("https://zoff.me");
-            return;
-        }*/
     if (subdomain[0] == "remote") {
       var data = {
         year: year,
@@ -264,22 +254,9 @@ function channel(req, res, next) {
     } else {
       if (req.params.channel_name == "o_callback") {
         res.redirect("/api/oauth");
-        //res.sendFile(path.join(pathThumbnails, '/public/assets/html/callback.html'));
       } else {
-        /*db.collection("frontpage_lists").find({"_id": Functions.encodeChannelName(req.params.channel_name)}, function(err, docs) {
-                    console.log(docs);
-                    var og_image = "https://zoff.me/assets/images/small-square.jpg";
-                    if(docs.length == 1) {
-                        if(docs[0].hasOwnProperty("thumbnail")) {
-                            if(docs[0].thumbnail.indexOf("mqdefault.jpg") > -1) docs[0].thumbnail = docs[0].thumbnail.replace("mqdefault", "hqdefault");
-                            og_image = docs[0].thumbnail;
-                        } else {
-                            og_image = "https://img.youtube.com/vi/" + docs[0].id + "/hqdefault.jpg";
-                        }
-                    }*/
         var data = {
           title: "404: File Not Found",
-          //list_name: capitalizeFirstLetter(Functions.decodeChannelName(req.params.channel_name)),
           list_name: capitalizeFirstLetter(req.params.channel_name),
           year: year,
           javascript_file: "main.min.js",
@@ -296,11 +273,7 @@ function channel(req, res, next) {
         if (subdomain[0] == "client") {
           data.client = true;
         }
-        if (req.params.channel_name == "404") {
-          res.status(404);
-        }
         res.render("layouts/client/channel", data);
-        //});
       }
     }
   } catch (e) {