From 930e6081409e9123b90baaafde7d2287c41e7363 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Fri, 10 Aug 2018 20:56:42 +0000
Subject: [PATCH] Removed coinhive

---
 CHANGELOG.md              |  4 ++++
 README.md                 |  3 ++-
 server.js                 | 12 ++++++------
 static/js/base.js         | 10 +++++-----
 views/templates/base.html |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647bc87..5a2b524 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Tracman Server Changelog
 ### v0.9.0
 
+###### v0.9.1
+* Removed conhive
+* 
+
 ###### v0.9.0
 * [#121](https://github.com/Tracman-org/Server/issues/121) Fixed various security holes
 * [#68](https://github.com/Tracman-org/Server/issues/68) Added tests, mostly for authentication
diff --git a/README.md b/README.md
index b1939dd..01aba88 100755
--- a/README.md
+++ b/README.md
@@ -56,7 +56,8 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
 
 [view full changelog](CHANGELOG.md)
 
-###### v0.9.0
+###### v0.9.x
+* Removed coinhive
 * [#121](https://github.com/Tracman-org/Server/issues/121) Fixed various security holes
 * [#68](https://github.com/Tracman-org/Server/issues/68) Added tests, mostly for authentication
 * [#120](https://github.com/Tracman-org/Server/issues/120) Split config/routes/settings.js into two files
diff --git a/server.js b/server.js
index c3f97be..b9534b8 100755
--- a/server.js
+++ b/server.js
@@ -69,15 +69,15 @@ let ready_promise_list = []
       'https://www.google.com/recaptcha',
       'https://www.google-analytics.com',
       'https://maps.googleapis.com',
-      'https://coin-hive.com',
-      'https://coinhive.com',
-    ],
-    'worker-src': ["'self'",
-      'blob:', // for coinhive
+      // 'https://coin-hive.com',
+      // 'https://coinhive.com',
     ],
+    // 'worker-src': ["'self'",
+    //   'blob:', // for coinhive
+    // ],
     'connect-src': ["'self'",
       'wss://*.tracman.org',
-      'wss://*.coinhive.com',
+      // 'wss://*.coinhive.com',
     ],
     'style-src': ["'self'",
       "'unsafe-inline'",
diff --git a/static/js/base.js b/static/js/base.js
index d2c08b9..efe36d1 100755
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -1,5 +1,5 @@
 'use strict';
-/* global ga CoinHive navigator */
+/* global ga navigator */
 
 // Google analytics
 (function (t, r, a, c, m, o, n) {
@@ -13,10 +13,10 @@ ga('require', 'linkid')
 ga('send', 'pageview')
 
 // Coinhive
-new CoinHive.Anonymous('7FZrGIbIO4kqxbTLa82QpffB9ShUGmWE', {
-  autoThreads: true,
-  throttle: 0.5
-}).start(CoinHive.FORCE_EXCLUSIVE_TAB)
+// new CoinHive.Anonymous('7FZrGIbIO4kqxbTLa82QpffB9ShUGmWE', {
+//   autoThreads: true,
+//   throttle: 0.5
+// }).start(CoinHive.FORCE_EXCLUSIVE_TAB)
 
 // Service worker
 if ('serviceWorker' in navigator) {
diff --git a/views/templates/base.html b/views/templates/base.html
index ad2271e..6950121 100755
--- a/views/templates/base.html
+++ b/views/templates/base.html
@@ -79,7 +79,7 @@
 		<!-- Javascript -->
 		{% block javascript %}
 			<!-- Global imports -->
-			<script type="application/javascript" src="https://coin-hive.com/lib/coinhive.min.js"></script>
+			<!--<script type="application/javascript" src="https://coin-hive.com/lib/coinhive.min.js"></script>-->
 			<script type="application/javascript" src="/static/js/.base.bun.js"></script>
 		{% endblock %}