From 1adff62a45b3a16185a097293569d0220e8d30b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 14 Nov 2017 12:24:09 +0100
Subject: [PATCH] Added a funny 404 page

---
 server/handlers/list.js |  7 ++++---
 server/index.js         |  4 ++++
 server/routing/api.js   | 10 ++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/handlers/list.js b/server/handlers/list.js
index b9cfcc77..1e5b8a0d 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -53,9 +53,11 @@ function list(msg, guid, coll, offline, socket) {
                         socket.emit("auth_required");
                     }
                 });
-            } else{
+            } else {
                 db.createCollection(coll, function(err, docs){
-                    db.collection(coll).insert({"addsongs":false, "adminpass":"", "allvideos":true, "frontpage":true, "longsongs":false, "removeplay": false, "shuffle": true, "skip": false, "skips": [], "startTime":Functions.get_time(), "views": [], "vote": false, "desc": ""}, function(err, docs){
+                    var configs = {"addsongs":false, "adminpass":"", "allvideos":true, "frontpage":true, "longsongs":false, "removeplay": false, "shuffle": true, "skip": false, "skips": [], "startTime":Functions.get_time(), "views": [], "vote": false, "desc": ""};
+                    db.collection(coll).insert(configs, function(err, docs){
+                        socket.join(coll);
                         List.send_list(coll, socket, true, false, true);
                         db.collection("frontpage_lists").insert({"_id": coll, "count" : 0, "frontpage": true, "accessed": Functions.get_time()});
                     });
@@ -361,7 +363,6 @@ function send_list(coll, socket, send, list_send, configs, shuffled)
             }
         });
 
-
         if(configs)
         {
             if(conf[0].adminpass !== "") conf[0].adminpass = true;
diff --git a/server/index.js b/server/index.js
index be0d27b7..d4f89866 100755
--- a/server/index.js
+++ b/server/index.js
@@ -129,6 +129,10 @@ app.use('/', router);
 
 app.use('/assets', express.static(publicPath + '/assets'));
 
+app.use(function (req, res, next) {
+  res.status(404).redirect("/404");
+})
+
 db.on('error',function(err) {
 	console.log("\n" + new Date().toString() + "\n Database error: ", err);
 });
diff --git a/server/routing/api.js b/server/routing/api.js
index 569692de..0d5963e9 100644
--- a/server/routing/api.js
+++ b/server/routing/api.js
@@ -25,8 +25,9 @@ router.route('/api/list/:channel_name').get(function(req, res) {
          res.setHeader('Content-Type', 'application/json');
          res.send(JSON.stringify(docs));
       } else {
-         res.status(404);
-         res.send(404);
+         /*res.status(404);
+         res.send(404);*/
+         res.status(404).redirect("/404");
       }
    });
 });
@@ -62,8 +63,9 @@ router.route('/api/conf/:channel_name').get(function(req, res) {
          res.setHeader('Content-Type', 'application/json');
          res.send(JSON.stringify(conf));
       } else {
-         res.status(404);
-         res.send(404);
+         /*res.status(404);
+         res.send(404);*/
+         res.status(404).redirect("/404");
       }
    });
 });