From 9302a271d085284dfdd97c46eabf45612f37d605 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Tue, 1 Nov 2016 22:44:26 -0700
Subject: [PATCH] Remove default contact config

---
 config.template.yaml  | 12 +++++++-----
 package.json          |  2 +-
 src/config.js         | 13 ++++++-------
 templates/contact.pug | 18 +++++++++---------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/config.template.yaml b/config.template.yaml
index 74749d58..53a7482c 100644
--- a/config.template.yaml
+++ b/config.template.yaml
@@ -91,7 +91,7 @@ https:
 # Page template values
 # title goes in the upper left corner, description goes in a <meta> tag
 html-template:
-  title: 'CyTube',
+  title: 'Sync',
   description: 'Free, open source synchtube'
 
 # Socket.IO server details
@@ -190,10 +190,12 @@ reserved-names:
   pagetitles: []
 
 # Provide a contact list for the /contact page
-contacts:
-  - name: 'calzoneman'
-    title: 'Developer'
-    email: 'cyzon@cytu.be'
+# Example:
+# contacts:
+#   - name: 'my_name'
+#     title: 'administrator
+#     email: 'me@my.site'
+contacts: []
 
 playlist:
   max-items: 4000
diff --git a/package.json b/package.json
index 797cb1e3..1af591c1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.23.5",
+  "version": "3.23.6",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
diff --git a/src/config.js b/src/config.js
index 6f9dc4ac..ebf55871 100644
--- a/src/config.js
+++ b/src/config.js
@@ -90,13 +90,7 @@ var defaults = {
         channels: ["^(.*?[-_])?admin(istrator)?([-_].*)?$", "^(.*?[-_])?owner([-_].*)?$"],
         pagetitles: []
     },
-    "contacts": [
-        {
-            name: "calzoneman",
-            title: "Developer",
-            email: "cyzon@cytu.be"
-        }
-    ],
+    "contacts": [],
     "aggressive-gc": false,
     playlist: {
         "max-items": 4000,
@@ -390,6 +384,11 @@ function preprocessConfig(cfg) {
             "for more information on registering a client ID");
     }
 
+    // Remove calzoneman from contact config (old default)
+    cfg.contacts = cfg.contacts.filter(contact => {
+        return contact.name !== 'calzoneman';
+    });
+
     return cfg;
 }
 
diff --git a/templates/contact.pug b/templates/contact.pug
index 43c9246c..f8d2af71 100644
--- a/templates/contact.pug
+++ b/templates/contact.pug
@@ -20,15 +20,15 @@ html(lang="en")
           .col-md-8.col-md-offset-2
             h1 Contact
             h3 Email
-            each contact in contacts
-              strong= contact.name
-              p.text-muted= contact.title
-              +email(contact.email, contact.emkey)
-              br
-              hr
-            h3 IRC
-            p.
-              The developer and other knowledgeable people are usually available on IRC for quick questions or comments.  Official support can be provided for cytu.be and synchtube.6irc.net at <a href="http://webchat.6irc.net/?channels=cytube">irc.6irc.net#cytube</a>.  These people can also address general questions about the software, but cannot provide technical support for third-party websites using this code.
+            if contacts.length == 0
+              p No contacts listed.
+            else
+              each contact in contacts
+                strong= contact.name
+                p.text-muted= contact.title
+                +email(contact.email, contact.emkey)
+                br
+                hr
     include footer
     +footer()
     script(type="text/javascript").