From b767c81eb5b09813ad75e3523fe8e736ee9443f3 Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Mon, 5 Oct 2020 17:19:51 -0400
Subject: [PATCH 1/8] migrate to tracker db v4

---
 databases/click2play.json      |  2 +-
 databases/compatibility.json   |  2 +-
 databases/surrogates.json      |  2 --
 src/background.js              |  8 ++++----
 src/classes/BugDb.js           | 37 ++++++++--------------------------
 src/classes/Click2PlayDb.js    |  2 +-
 src/classes/CompatibilityDb.js |  2 +-
 src/classes/Updatable.js       | 10 ++++-----
 tools/amo/build.sh             |  8 ++++----
 9 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/databases/click2play.json b/databases/click2play.json
index 20ab9b3e3..309da5e6f 100644
--- a/databases/click2play.json
+++ b/databases/click2play.json
@@ -8,5 +8,5 @@
 			"aid": 6
 		}
 	],
-	"click2playVersion": 0
+	"version": 0
 }
diff --git a/databases/compatibility.json b/databases/compatibility.json
index 0bcc5c085..f743da834 100644
--- a/databases/compatibility.json
+++ b/databases/compatibility.json
@@ -8,5 +8,5 @@
 			]
 		}
 	],
-	"compatibilityVersion": 0
+	"version": 0
 }
diff --git a/databases/surrogates.json b/databases/surrogates.json
index 58332c5d1..cc5e2ecca 100644
--- a/databases/surrogates.json
+++ b/databases/surrogates.json
@@ -2,13 +2,11 @@
 	"surrogates": {
 		"1": "var urchinTracker=function(){},_gaq={push:function(){try {if(arguments[0][0]==='_link'){window.location.href=arguments[0][1];}}catch(er){}}},_gat={_createTracker:function(){}, _getTracker:function(){return{__noSuchMethod__:function(){},_link:function(o){if(o){location.href=o;}},_linkByPost:function(){return true;},_getLinkerUrl:function(o){return o;},_trackEvent:function(){}};}};"
 	},
-
 	"mappings": [
 		{
 			"app_id": [13],
 			"sid": 1
 		}
 	],
-
 	"version": 0
 }
diff --git a/src/background.js b/src/background.js
index 1644488a0..35881f4e7 100644
--- a/src/background.js
+++ b/src/background.js
@@ -70,7 +70,7 @@ const {
 const IS_EDGE = (BROWSER_INFO.name === 'edge');
 const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
 const IS_ANDROID = (BROWSER_INFO.os === 'android');
-const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/version`;
+const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/v4/version`;
 const REAL_ESTATE_ID = 'ghostery';
 const ONE_DAY_MSEC = 86400000;
 const ONE_HOUR_MSEC = 3600000;
@@ -120,9 +120,9 @@ function updateDBs() {
 		utils.getJson(VERSION_CHECK_URL).then((data) => {
 			log('Database version retrieval succeeded', data);
 
-			c2pDb.update(data.click2playVersion);
-			compDb.update(data.compatibilityVersion);
-			bugDb.update(data.bugsVersion, (result) => {
+			c2pDb.update(data.click2play);
+			compDb.update(data.compatibility);
+			bugDb.update(data.bugs, (result) => {
 				log('CHECK LIBRARY VERSION CALLED', result);
 				if (result.success) {
 					const nowTime = Number(new Date().getTime());
diff --git a/src/classes/BugDb.js b/src/classes/BugDb.js
index 5ca1fd738..84c8ee6af 100644
--- a/src/classes/BugDb.js
+++ b/src/classes/BugDb.js
@@ -12,7 +12,7 @@
  */
 
 import {
-	difference, each, every, keys, reduce, size
+	difference, each, every, keys, size
 } from 'underscore';
 import conf from './Conf';
 import Updatable from './Updatable';
@@ -194,34 +194,13 @@ class BugDb extends Updatable {
 		if (!fromMemory) {
 			const old_bugs = conf.bugs;
 			let	new_app_ids;
-			// if there is an older bugs object in storage,
-			// update newAppIds and apply block-by-default
-			if (old_bugs) {
-				if (old_bugs.hasOwnProperty('version') && bugs.version > old_bugs.version) {
-					new_app_ids = BugDb.updateNewAppIds(bugs.apps, old_bugs.apps);
-
-					if (new_app_ids.length) {
-						BugDb.applyBlockByDefault(new_app_ids);
-						db.JUST_UPDATED_WITH_NEW_TRACKERS = true;
-					}
-
-				// pre-trie/legacy db
-				} else if (old_bugs.hasOwnProperty('bugsVersion') && bugs.version !== old_bugs.bugsVersion) {
-					const old_apps = reduce(old_bugs.bugs, (acc, bug) => {
-						acc[bug.aid] = true;
-						return acc;
-					}, {});
-
-					new_app_ids = BugDb.updateNewAppIds(bugs.apps, old_apps);
-
-					if (new_app_ids.length) {
-						BugDb.applyBlockByDefault(new_app_ids);
-
-						// don't claim new trackers when db got downgraded by version
-						if (bugs.version > old_bugs.bugsVersion) {
-							db.JUST_UPDATED_WITH_NEW_TRACKERS = true;
-						}
-					}
+			// if there is an older bugs object in storage update newAppIds and apply block-by-default
+			if (old_bugs && old_bugs.hasOwnProperty('version') && (old_bugs.version !== bugs.version)) {
+				new_app_ids = BugDb.updateNewAppIds(bugs.apps, old_bugs.apps);
+
+				if (new_app_ids.length) {
+					BugDb.applyBlockByDefault(new_app_ids);
+					db.JUST_UPDATED_WITH_NEW_TRACKERS = true;
 				}
 			}
 
diff --git a/src/classes/Click2PlayDb.js b/src/classes/Click2PlayDb.js
index 69172c150..4ab8791b4 100644
--- a/src/classes/Click2PlayDb.js
+++ b/src/classes/Click2PlayDb.js
@@ -41,7 +41,7 @@ class Click2PlayDb extends Updatable {
 		log('processing c2p...');
 
 		try {
-			db = Click2PlayDb._buildDb(data.click2play, data.click2playVersion);
+			db = Click2PlayDb._buildDb(data.click2play, data.version);
 		} catch (e) {
 			log('Click2PlayDb processList() error', e);
 			return false;
diff --git a/src/classes/CompatibilityDb.js b/src/classes/CompatibilityDb.js
index 94afc446e..23e382233 100644
--- a/src/classes/CompatibilityDb.js
+++ b/src/classes/CompatibilityDb.js
@@ -36,7 +36,7 @@ class CompatibilityDb extends Updatable {
 		log('processing comp...');
 
 		try {
-			db = CompatibilityDb._buildDb(comp.compatibility, comp.compatibilityVersion);
+			db = CompatibilityDb._buildDb(comp.compatibility, comp.version);
 		} catch (e) {
 			log('CompatibilityDb processList() error', e);
 			return false;
diff --git a/src/classes/Updatable.js b/src/classes/Updatable.js
index b8a5ba576..cbc1c2114 100644
--- a/src/classes/Updatable.js
+++ b/src/classes/Updatable.js
@@ -74,10 +74,9 @@ class Updatable {
 	_localFetcher() {
 		return new Promise((resolve, reject) => {
 			const memory = conf[this.type];
-			const version_property = (this.type === 'bugs' || this.type === 'surrogates' ? 'version' : (`${this.type}Version`));
 
 			// nothing in storage, or it's so old it doesn't have a version
-			if (!memory || !memory.hasOwnProperty(version_property)) {
+			if (!memory || !memory.hasOwnProperty('version')) {
 				// return what's on disk
 				log(`fetching ${this.type} from disk`);
 
@@ -94,7 +93,7 @@ class Updatable {
 			} else if (this.just_upgraded) {
 				// on upgrades, see if json shipped w/ the extension is more recent
 				fetchLocalJSONResource(`databases/${this.type}.json`).then((disk) => {
-					if (disk[version_property] > memory[version_property]) {
+					if (disk.version !== memory.version) {
 						log(`fetching updated${this.type} from disk`);
 						resolve({
 							fromMemory: false,
@@ -131,8 +130,7 @@ class Updatable {
 	 */
 	_remoteFetcher(callback) {
 		log(`fetching ${this.type} from remote`);
-		const UPDATE_URL = `${CDN_BASE_URL}/update/${
-			this.type === 'bugs' ? 'v3/bugs' : this.type}`;
+		const UPDATE_URL = `${CDN_BASE_URL}/update/v4/${this.type}`;
 
 		getJson(UPDATE_URL).then((list) => {
 			callback(true, list);
@@ -153,7 +151,7 @@ class Updatable {
 		log('LOCAL VERSION, SERVER VERSION', this.db.version, options.version);
 
 		// is the local version already up-to-date?
-		if (this.db.version && options.version && (options.version <= this.db.version)) {
+		if (this.db.version && options.version && (options.version === this.db.version)) {
 			if (options.callback) {
 				options.callback({
 					success: true,
diff --git a/tools/amo/build.sh b/tools/amo/build.sh
index 6b2d455e4..4f691b23b 100755
--- a/tools/amo/build.sh
+++ b/tools/amo/build.sh
@@ -110,10 +110,10 @@ cat ${TMP_FILE} > $VERSION_FILE # copy into manifest.json
 rm -f ${TMP_FILE}
 
 # Download databases
-curl "https://cdn.ghostery.com/update/v3/bugs" -o $DB_DIR/bugs.json --compressed --fail
-curl "https://cdn.ghostery.com/update/click2play" -o $DB_DIR/click2play.json --compressed --fail
-curl "https://cdn.ghostery.com/update/compatibility" -o $DB_DIR/compatibility.json --compressed --fail
-curl "https://cdn.ghostery.com/update/surrogates" -o $DB_DIR/surrogates.json --compressed --fail
+curl "https://cdn.ghostery.com/update/v4/bugs" -o $DB_DIR/bugs.json --compressed --fail
+curl "https://cdn.ghostery.com/update/v4/click2play" -o $DB_DIR/click2play.json --compressed --fail
+curl "https://cdn.ghostery.com/update/v4/compatibility" -o $DB_DIR/compatibility.json --compressed --fail
+curl "https://cdn.ghostery.com/update/v4/surrogates" -o $DB_DIR/surrogates.json --compressed --fail
 
 # Zip final build files
 echo "Zipping to $(pwd)/$BUILD_DIR/"

From 2cdc1671524844e6aae7f08a357502447a19a6e5 Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Thu, 10 Dec 2020 16:31:22 -0500
Subject: [PATCH 2/8] new db files now using .json extension from cdn

---
 src/background.js        | 2 +-
 src/classes/Updatable.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/background.js b/src/background.js
index 35881f4e7..07b30c44f 100644
--- a/src/background.js
+++ b/src/background.js
@@ -70,7 +70,7 @@ const {
 const IS_EDGE = (BROWSER_INFO.name === 'edge');
 const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
 const IS_ANDROID = (BROWSER_INFO.os === 'android');
-const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/v4/version`;
+const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/v4/versions.json`;
 const REAL_ESTATE_ID = 'ghostery';
 const ONE_DAY_MSEC = 86400000;
 const ONE_HOUR_MSEC = 3600000;
diff --git a/src/classes/Updatable.js b/src/classes/Updatable.js
index cbc1c2114..740a38528 100644
--- a/src/classes/Updatable.js
+++ b/src/classes/Updatable.js
@@ -130,7 +130,7 @@ class Updatable {
 	 */
 	_remoteFetcher(callback) {
 		log(`fetching ${this.type} from remote`);
-		const UPDATE_URL = `${CDN_BASE_URL}/update/v4/${this.type}`;
+		const UPDATE_URL = `${CDN_BASE_URL}/update/v4/${this.type}.json`;
 
 		getJson(UPDATE_URL).then((list) => {
 			callback(true, list);

From 7d88f80b0ddb189ba09f004cc16ea1712f1e890a Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Thu, 10 Dec 2020 16:35:38 -0500
Subject: [PATCH 3/8] resolve conflicts

---
 src/background.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/background.js b/src/background.js
index 07b30c44f..56b3293dd 100644
--- a/src/background.js
+++ b/src/background.js
@@ -71,7 +71,6 @@ const IS_EDGE = (BROWSER_INFO.name === 'edge');
 const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
 const IS_ANDROID = (BROWSER_INFO.os === 'android');
 const VERSION_CHECK_URL = `${CDN_BASE_URL}/update/v4/versions.json`;
-const REAL_ESTATE_ID = 'ghostery';
 const ONE_DAY_MSEC = 86400000;
 const ONE_HOUR_MSEC = 3600000;
 const onBeforeRequest = events.onBeforeRequest.bind(events);

From a950fe90427644f3161aa91597dc80023a8be11f Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Mon, 14 Dec 2020 14:34:42 -0500
Subject: [PATCH 4/8] GH-2172 migrate tracker descriptions to whotracks.me

---
 .../components/Blocking/GlobalTracker.jsx     | 26 ++++++++++++-------
 app/panel/components/Blocking/Tracker.jsx     | 20 +++++++-------
 manifest.json                                 |  7 ++---
 src/background.js                             |  7 ++---
 src/classes/Globals.js                        |  1 +
 5 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/app/panel/components/Blocking/GlobalTracker.jsx b/app/panel/components/Blocking/GlobalTracker.jsx
index df2221d95..8dffa4adf 100644
--- a/app/panel/components/Blocking/GlobalTracker.jsx
+++ b/app/panel/components/Blocking/GlobalTracker.jsx
@@ -33,6 +33,7 @@ class GlobalTracker extends React.Component {
 			description: '',
 			showMoreInfo: false,
 			showTrackerLearnMore: false,
+			wtmID: null,
 		};
 
 		// click bindings
@@ -43,10 +44,10 @@ class GlobalTracker extends React.Component {
 	/**
 	 * Implement handler for clicking on the tracker title
 	 * which shows/hides tracker description. On show it retrieves
-	 * description from https://apps.ghostery.com and sets it in state.
+	 * description from whotracks.me and sets it in state.
 	 */
 	toggleDescription() {
-		const { tracker, language } = this.props;
+		const { tracker } = this.props;
 		const { description } = this.state;
 		this.setState(prevState => ({ showMoreInfo: !prevState.showMoreInfo }));
 
@@ -56,14 +57,14 @@ class GlobalTracker extends React.Component {
 
 		this.setState({ description: t('tracker_description_getting') });
 
-		sendMessageInPromise('getTrackerDescription', {
-			url: `${globals.APPS_BASE_URL}/${language}/apps/${
-				encodeURIComponent(tracker.name.replace(/\s+/g, '_').toLowerCase())}?format=json`,
+		sendMessageInPromise('getTrackerInfo', {
+			url: `${globals.WTM_BASE_URL}/data/trackers/ghostery/${tracker.id}.json`,
 		}).then((data) => {
-			if (data) {
-				const truncate = (data.length > 200) ? `${data.substr(0, 199)}...` : data;
+			if (data && data.description) {
+				const truncate = (data.description.length > 200) ? `${data.description.substr(0, 199)}...` : data.description;
 				this.setState({ description: truncate });
 				this.setState({ showTrackerLearnMore: true });
+				this.setState({ wtmID: data.id });
 			} else {
 				this.setState({ description: t('tracker_description_none_found') });
 			}
@@ -99,8 +100,13 @@ class GlobalTracker extends React.Component {
 	* @return {ReactComponent}   ReactComponent instance
 	*/
 	render() {
-		const { tracker, language } = this.props;
-		const { showMoreInfo, description, showTrackerLearnMore } = this.state;
+		const { tracker } = this.props;
+		const {
+			showMoreInfo,
+			description,
+			showTrackerLearnMore,
+			wtmID
+		} = this.state;
 		return (
 			<div className="global-blocking-trk">
 				<div className="row align-middle trk-header">
@@ -119,7 +125,7 @@ class GlobalTracker extends React.Component {
 								{
 									showTrackerLearnMore && (
 										<div className={(!showTrackerLearnMore ? 'hide' : '')}>
-											<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.APPS_BASE_URL}/${language}/apps/${encodeURIComponent(tracker.name.replace(/\s+/g, '_').toLowerCase())}`}>
+											<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(wtmID).toLowerCase()}.html`}>
 												{ t('tracker_description_learn_more') }
 											</a>
 										</div>
diff --git a/app/panel/components/Blocking/Tracker.jsx b/app/panel/components/Blocking/Tracker.jsx
index 89b2a0260..3f2740796 100644
--- a/app/panel/components/Blocking/Tracker.jsx
+++ b/app/panel/components/Blocking/Tracker.jsx
@@ -35,6 +35,7 @@ class Tracker extends React.Component {
 			showTrackerLearnMore: false,
 			trackerClasses: '',
 			warningImageTitle: '',
+			wtmID: null,
 		};
 
 		// click bindings
@@ -139,27 +140,27 @@ class Tracker extends React.Component {
 	/**
 	 * Implement handler for clicking on the tracker title
 	 * which shows/hides tracker description. On show it retrieves
-	 * description from https://apps.ghostery.com and sets it in state.
+	 * description from whotracks.me and sets it in state.
 	 */
 	toggleDescription() {
-		const { tracker, language } = this.props;
+		const { tracker } = this.props;
+		const { description } = this.state;
 		this.setState(prevState => ({ showMoreInfo: !prevState.showMoreInfo }));
 
-		const { description } = this.state;
 		if (description) {
 			return;
 		}
 
 		this.setState({ description: t('tracker_description_getting') });
 
-		sendMessageInPromise('getTrackerDescription', {
-			url: `${globals.APPS_BASE_URL}/${language}/apps/${
-				encodeURIComponent(tracker.name.replace(/\s+/g, '_').toLowerCase())}?format=json`,
+		sendMessageInPromise('getTrackerInfo', {
+			url: `${globals.WTM_BASE_URL}/data/trackers/ghostery/${tracker.id}.json`,
 		}).then((data) => {
-			if (data) {
-				const truncate = (data.length > 200) ? `${data.substr(0, 199)}...` : data;
+			if (data && data.description) {
+				const truncate = (data.description.length > 200) ? `${data.description.substr(0, 199)}...` : data.description;
 				this.setState({ description: truncate });
 				this.setState({ showTrackerLearnMore: true });
+				this.setState({ wtmID: data.id });
 			} else {
 				this.setState({ description: t('tracker_description_none_found') });
 			}
@@ -335,6 +336,7 @@ class Tracker extends React.Component {
 			warningImageTitle,
 			showMoreInfo,
 			showTrackerLearnMore,
+			wtmID,
 		} = this.state;
 
 		let sources;
@@ -400,7 +402,7 @@ class Tracker extends React.Component {
 								<div className="trk-description">
 									{description}
 									<div className={(!showTrackerLearnMore ? 'hide' : '')}>
-										<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.APPS_BASE_URL}/${language}/apps/${encodeURIComponent(tracker.name.replace(/\s+/g, '_').toLowerCase())}`}>
+										<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(wtmID).toLowerCase()}.html`}>
 											{t('tracker_description_learn_more')}
 										</a>
 									</div>
diff --git a/manifest.json b/manifest.json
index f1b8a7cb8..d9b4d383d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,11 @@
 	"author": "Ghostery",
 	"name": "__MSG_name__",
 	"short_name": "Ghostery",
-	"version": "8.5.4",
-	"version_name": "8.5.4",
+	"version": "8.5.5",
+	"version_name": "8.5.5",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
+	"debug": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",
@@ -111,4 +112,4 @@
 	"web_accessible_resources": [
 		"app/images/*"
 	]
-}
\ No newline at end of file
+}
diff --git a/src/background.js b/src/background.js
index 556e59f4c..cb7a39a7e 100644
--- a/src/background.js
+++ b/src/background.js
@@ -759,10 +759,11 @@ function onMessageHandler(request, sender, callback) {
 		}
 		return true;
 	}
-	if (name === 'getTrackerDescription') {
+	if (name === 'getTrackerInfo') {
 		utils.getJson(message.url).then((result) => {
-			const description = (result) ? ((result.company_in_their_own_words) ? result.company_in_their_own_words : ((result.company_description) ? result.company_description : '')) : '';
-			callback(description);
+			callback(result);
+		}).catch(() => {
+			callback(false);
 		});
 		return true;
 	}
diff --git a/src/classes/Globals.js b/src/classes/Globals.js
index 8c7a11582..f8a5df397 100644
--- a/src/classes/Globals.js
+++ b/src/classes/Globals.js
@@ -58,6 +58,7 @@ class Globals {
 		this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`;
 		this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`;
 		this.APPS_BASE_URL = `https://${this.DEBUG ? 'staging-apps' : 'apps'}.ghostery.com`;
+		this.WTM_BASE_URL = 'https://www.whotracks.me';
 		this.GCACHE_BASE_URL = `https://${this.DEBUG ? 'staging-gcache' : 'gcache'}.ghostery.com`;
 		this.AUTH_SERVER = `https://consumerapi.${this.GHOSTERY_ROOT_DOMAIN}`;
 		this.ACCOUNT_SERVER = `https://accountapi.${this.GHOSTERY_ROOT_DOMAIN}`;

From 8041d177ba19b23197e84aec2d2b0a98a0327730 Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Mon, 14 Dec 2020 16:44:58 -0500
Subject: [PATCH 5/8] remove legacy apps pages integration

---
 .eslintignore                                 |   3 -
 app/content-scripts/ghostery_dot_com.js       | 175 --------
 .../vendor/bootstrap_tooltip.js               | 407 ------------------
 app/images/apps_pages/tracker.png             | Bin 14678 -> 0 bytes
 app/scss/ghostery_dot_com.scss                | 165 -------
 manifest.json                                 |  17 -
 src/background.js                             |  43 --
 src/classes/EventHandlers.js                  |  12 +-
 src/classes/Globals.js                        |   1 -
 src/utils/click2play.js                       |  41 +-
 webpack.config.js                             |   3 -
 11 files changed, 32 insertions(+), 835 deletions(-)
 delete mode 100644 app/content-scripts/ghostery_dot_com.js
 delete mode 100644 app/content-scripts/vendor/bootstrap_tooltip.js
 delete mode 100644 app/images/apps_pages/tracker.png
 delete mode 100644 app/scss/ghostery_dot_com.scss

diff --git a/.eslintignore b/.eslintignore
index ffb934815..952a9a6a2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,9 +8,6 @@
 ## Data Images
 app/data-images/
 
-## Vendor Files
-app/content-scripts/vendor/
-
 ## Precompiled
 app/templates/
 build/
diff --git a/app/content-scripts/ghostery_dot_com.js b/app/content-scripts/ghostery_dot_com.js
deleted file mode 100644
index 95f61e1bd..000000000
--- a/app/content-scripts/ghostery_dot_com.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Ghostery.com Extension Support
- *
- * This file connects the extension to the Ghostery website
- * located at https://www.ghostery.com/products/
- * and Apps pages located at https://apps.ghostery.com/ and
- * https://gcache.ghostery.com/
- *
- * Ghostery Browser Extension
- * https://www.ghostery.com/
- *
- * Copyright 2019 Ghostery, Inc. All rights reserved.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0
- */
-/**
- * @namespace  GhosteryDotComContentScript
- */
-/* eslint import/no-extraneous-dependencies: 0 */
-
-import $ from 'jquery';
-import msgModule from './utils/msg';
-import './vendor/bootstrap_tooltip';
-
-const msg = msgModule('ghostery_dot_com');
-const { sendMessage } = msg;
-const { onMessage } = chrome.runtime;
-/**
- * This context script is injected statically through manifest.json
- * Along with it a stylesheet ghostery_dot_com_css is injected, also
- * through the manifest. Functions in this script refer both to element
- * selectors provided by pages and to style class names provided by
- * injected stylesheet.
- *
- * Use this variable to call init and initialize functionality of this script.
- * @var {Object}   	initialized with an object with init as its property
- */
-const GhosteryDotComContentScript = (function(window) {
-	/**
-	 * Update https://www.ghostery.com/Products page to signify
-	 * that Ghostery extension is installed.
-	 * @memberOf  GhosteryDotComContentScript
-	 * @package
-	 */
-	const productsPage = function() {
-		const $installButton = $('#ghostery-extension-versions .install-button').not('.disabled');
-		$installButton.addClass('success').text('Installed ✓');
-		$installButton.removeAttr('onclick');
-		$('.success').on('click', (e) => {
-			e.preventDefault();
-		});
-	};
-
-	/**
-	 * Animate blocking tracker button on tracker pages
-	 * https://apps.ghostery.com/en/apps/<tracker_name>
-	 * @memberOf  GhosteryDotComContentScript
-	 * @package
-	 */
-	const toggleBlocking = function(blocked, duration) {
-		if (!blocked) {
-			$('#app-global-blocking').animate({ 'background-position-x': '-17px' }, {
-				duration,
-				complete() {
-					$(this).removeClass('blocked').addClass('unblocked');
-					$(this).parent().removeClass('blocked').addClass('unblocked');
-				}
-			});
-		} else {
-			$('#app-global-blocking').animate({ 'background-position-x': '3px' }, {
-				duration,
-				complete() {
-					$(this).removeClass('unblocked').addClass('blocked');
-					$(this).parent().removeClass('unblocked').addClass('blocked');
-				}
-			});
-		}
-	};
-	/**
-	 * Connect to blocking box on https://apps.ghostery.com/en/apps/<tracker_name>
-	 * @memberOf  GhosteryDotComContentScript
-	 * @package
-	 */
-	const appsPages = function() {
-		const $appGlobalBlocking = $('#app-global-blocking');
-		const $blockingBox = $('#blockingbox');
-		const app_id = $blockingBox.data('id');
-		let	alreadyLoaded = false;
-		let tooltipTimeout;
-
-		sendMessage('appsPageLoaded', {
-			id: app_id
-		});
-
-		onMessage.addListener((request) => {
-			if (request.source === 'cliqz-content-script') {
-				return false;
-			}
-
-			const { name } = request;
-			let { blocked } = request.message;
-
-			if (name === 'appsPageData' && !alreadyLoaded) {
-				// TODO why does background page occasionally send response twice?
-				alreadyLoaded = true;
-
-				$('#ghosterybox').hide();
-				$blockingBox.show();
-
-				toggleBlocking(blocked, 0);
-
-				$appGlobalBlocking.on('click', () => {
-					blocked = !blocked;
-
-					sendMessage('panelSelectedAppsUpdate', {
-						app_id,
-						app_selected: blocked
-					});
-
-					$('#global-blocking-control')
-						.tooltip('destroy')
-						.tooltip({
-							trigger: 'manual',
-							title: `Tracker ${blocked ? 'blocked' : 'unblocked'}`,
-							placement: 'bottom'
-						})
-						.tooltip('show');
-
-					window.clearTimeout(tooltipTimeout);
-					tooltipTimeout = window.setTimeout(() => {
-						$('#global-blocking-control').tooltip('destroy');
-					}, 1400);
-
-					toggleBlocking(blocked, 'fast');
-				});
-			}
-			return false;
-		});
-	};
-	/**
-	 * Selectively initialize functionality for www.ghostery.com,
-	 * apps.ghostery.com or gcache.ghostery.com platform pages.
-	 * @memberOf  GhosteryDotComContentScript
-	 * @package
-	 */
-	const _initialize = function() {
-		// initialize products page
-		if ($('section.products-template').length) {
-			productsPage();
-		}
-		// initialize apps pages
-		if ($('#ghosterybox').length) {
-			appsPages();
-		}
-	};
-
-	// Public API
-	return {
-		/**
-		 * Initialize functionality for product pages.
-		 * @memberOf  GhosteryDotComContentScript
-		 * @public
-		 */
-		init() {
-			_initialize();
-		}
-	};
-}(window));
-
-// Run our init on DOMReady
-$(document).ready(() => {
-	GhosteryDotComContentScript.init();
-});
diff --git a/app/content-scripts/vendor/bootstrap_tooltip.js b/app/content-scripts/vendor/bootstrap_tooltip.js
deleted file mode 100644
index a0b8a51bd..000000000
--- a/app/content-scripts/vendor/bootstrap_tooltip.js
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ===================================================
- * bootstrap-transition.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-import $ from 'jquery';
-global.jQuery = $;
-
-!function ($) {
-  "use strict";
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-  $(function () {
-    $.support.transition = (function () {
-      var transitionEnd = (function () {
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-      }())
-      return transitionEnd && {
-        end: transitionEnd
-      }
-    })()
-  })
-}(jQuery);
-
-/* ===========================================================
- * bootstrap-tooltip.js v2.3.2
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-!function ($) {
-
-  "use strict";
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Tooltip = function (element, options) {
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-        , triggers
-        , trigger
-        , i
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      triggers = this.options.trigger.split(' ')
-
-      for (i = triggers.length; i--;) {
-        trigger = triggers[i]
-        if (trigger == 'click') {
-          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-        } else if (trigger != 'manual') {
-          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-        }
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
-
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
-
-      self = $(e.currentTarget)[this.type](options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) return self.show()
-
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
-    }
-
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
-
-  , show: function () {
-      var $tip
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-        , e = $.Event('show')
-
-      if (this.hasContent() && this.enabled) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
-
-        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-        pos = this.getPosition()
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        this.applyPlacement(tp, placement)
-        this.$element.trigger('shown')
-      }
-    }
-
-  , applyPlacement: function(offset, placement){
-      var $tip = this.tip()
-        , width = $tip[0].offsetWidth
-        , height = $tip[0].offsetHeight
-        , actualWidth
-        , actualHeight
-        , delta
-        , replace
-
-      $tip
-        .offset(offset)
-        .addClass(placement)
-        .addClass('in')
-
-      actualWidth = $tip[0].offsetWidth
-      actualHeight = $tip[0].offsetHeight
-
-      if (placement == 'top' && actualHeight != height) {
-        offset.top = offset.top + height - actualHeight
-        replace = true
-      }
-
-      if (placement == 'bottom' || placement == 'top') {
-        delta = 0
-
-        if (offset.left < 0){
-          delta = offset.left * -2
-          offset.left = 0
-          $tip.offset(offset)
-          actualWidth = $tip[0].offsetWidth
-          actualHeight = $tip[0].offsetHeight
-        }
-
-        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-      } else {
-        this.replaceArrow(actualHeight - height, actualHeight, 'top')
-      }
-
-      if (replace) $tip.offset(offset)
-    }
-
-  , replaceArrow: function(delta, dimension, position){
-      this
-        .arrow()
-        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-
-      $tip.find('.bs-tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-        , e = $.Event('hide')
-
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
-
-      this.$element.trigger('hidden')
-
-      return this
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function () {
-      var el = this.$element[0]
-      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-        width: el.offsetWidth
-      , height: el.offsetHeight
-      }, this.$element.offset())
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , arrow: function(){
-      return this.$arrow = this.$arrow || this.tip().find(".bs-tooltip-arrow")
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function (e) {
-      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-      self.tip().hasClass('in') ? self.hide() : self.show()
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  }
-
-
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="bs-tooltip"><div class="bs-tooltip-arrow"></div><div class="bs-tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
-
-
- /* TOOLTIP NO CONFLICT
-  * =================== */
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
diff --git a/app/images/apps_pages/tracker.png b/app/images/apps_pages/tracker.png
deleted file mode 100644
index e6dfcc116648bad89f56a6735c7ac615be6117a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14678
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

diff --git a/app/scss/ghostery_dot_com.scss b/app/scss/ghostery_dot_com.scss
deleted file mode 100644
index 6ac91aaa0..000000000
--- a/app/scss/ghostery_dot_com.scss
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Ghostery.com CSS
- *
- * Injected CSS for Ghostery website download page
- * located at https://www.ghostery.com/products/
- * and Apps pages located at https://apps.ghostery.com/ and
- * https://gcache.ghostery.com/
- *
- * Compiled to /dist/css/ghostery_dot_com.css
- *
- * Ghostery Browser Extension
- * https://www.ghostery.com/
- *
- * Copyright 2019 Ghostery, Inc. All rights reserved.
- * 
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0
- */
-
-h1.want-to-block {
-	width: 200px;
-	display: inline-block;
-	vertical-align: middle;
-}
-#global-blocking-control {
-	display: inline-block;
-	vertical-align: middle;
-	width: 45px;
-	height: 30px;
-	background: url('chrome-extension://__MSG_@@extension_id__/app/images/apps_pages/tracker.png') no-repeat;
-	background-position: -20px -20px;
-	&.blocked:hover {
-		background-position: -20px -160px;
-	}
-	&.unblocked:hover {
-		background-position: -20px -90px;
-	}
-}
-#app-global-blocking {
-	float: left;
-	width: 44px;
-	cursor: pointer;
-	background: url('chrome-extension://__MSG_@@extension_id__/app/images/apps_pages/tracker.png') no-repeat;
-	&.blocked {
-		height: 24px;
-		background-position: 3px -635px;
-	}
-	&.blocked:hover {
-		background-position: 3px -699px;
-	}
-	&.unblocked {
-		height: 24px;
-		background-position: -17px -891px;
-	}
-	&.unblocked:hover {
-		background-position: -17px -955px;
-	}
-	&.whitelisted {
-		background-position-y: -763px;
-	}
-	&.whitelisted:hover {
-		background-position-y: -827px;
-	}
-	&.paused {
-		background-position-y: -507px;
-	}
-	&.paused:hover {
-		background-position-y: -571px;
-	}
-}
-
-/**
- * Bootstrap Tooltip CSS
- *
- * Used on Ghostery Apps pages located at
- * https://apps.ghostery.com/
- */
-.bs-tooltip {
-	position: absolute;
-	z-index: 1030;
-	display: block;
-	visibility: visible;
-	font-family: Helvetica, Arial, sans-serif;
-	font-size: 12px;
-	line-height: 1.4;
-	opacity: 0;
-	filter: alpha(opacity=0);
-	&.in {
-		opacity: 0.8;
-		filter: alpha(opacity=80);
-	}
-	&.top {
-		margin-top: -10px;
-		padding: 5px 0;
-		.bs-tooltip-arrow {
-			bottom: 0;
-			left: 50%;
-			margin-left: -5px;
-			border-width: 5px 5px 0;
-			border-top-color: #000000;
-		}
-	}
-	&.right {
-		margin-left: 10px;
-		padding: 0 5px;
-		.bs-tooltip-arrow {
-			top: 50%;
-			left: 0;
-			margin-top: -5px;
-			border-width: 5px 5px 5px 0;
-			border-right-color: #000000;
-		}
-	}
-	&.bottom {
-		margin-top: 0px;
-		padding: 5px 0;
-		.bs-tooltip-arrow {
-			top: 0;
-			left: 50%;
-			margin-left: -5px;
-			border-width: 0 5px 5px;
-			border-bottom-color: #000000;
-		}
-	}
-	&.left {
-		margin-left: -10px;
-		padding: 0 5px;
-		.bs-tooltip-arrow {
-			top: 50%;
-			right: 0;
-			margin-top: -5px;
-			border-width: 5px 0 5px 5px;
-			border-left-color: #000000;
-		}
-	}
-	.bs-tooltip-inner {
-		max-width: 200px;
-		padding: 5px 10px;
-		color: #ffffff;
-		text-align: center;
-		text-decoration: none;
-		background-color: #000000;
-		-webkit-border-radius: 4px;
-		-moz-border-radius: 4px;
-		border-radius: 4px;
-	}
-	.bs-tooltip-arrow {
-		position: absolute;
-		width: 0;
-		height: 0;
-		border-color: transparent;
-		border-style: solid;
-	}
-	.fade {
-		opacity: 0;
-		-webkit-transition: opacity 0.20s linear;
-		-moz-transition: opacity 0.20s linear;
-		-o-transition: opacity 0.20s linear;
-		transition: opacity 0.20s linear;
-	}
-	.fade.in {
-		opacity: .6;
-	}
-}
diff --git a/manifest.json b/manifest.json
index d9b4d383d..110e48c15 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,23 +26,6 @@
 	},
 	"options_page": "app/templates/hub.html",
 	"content_scripts": [
-		{
-			"all_frames": false,
-			"js": [
-				"dist/ghostery_dot_com.js"
-			],
-			"css": [
-				"dist/css/ghostery_dot_com_css.css"
-			],
-			"matches": [
-				"https://www.ghostery.com/*",
-				"https://apps.ghostery.com/*",
-				"https://staging-apps.ghostery.com/*",
-				"https://gcache.ghostery.com/*",
-				"https://staging-gcache.ghostery.com/*"
-			],
-			"run_at": "document_idle"
-		},
 		{
 			"all_frames": false,
 			"js": [
diff --git a/src/background.js b/src/background.js
index cb7a39a7e..615d8a178 100644
--- a/src/background.js
+++ b/src/background.js
@@ -347,43 +347,6 @@ function handleCheckoutPages(name) {
 	}
 }
 
-/**
- * Handle messages sent from dist/ghostery_dot_com.js content script.
- * @memberOf Background
- *
- * @param  {string} 	name 		message name
- * @param  {Object} 	message 	message data
- * @param  {number} 		tab_id 		tab id
- */
-function handleGhosteryDotCom(name, message, tab_id) {
-	if (name === 'appsPageLoaded') {
-		if (tab_id) {
-			sendMessage(tab_id, 'appsPageData', {
-				blocked: conf.selected_app_ids[message.id] === 1
-			});
-		} else {
-			utils.getActiveTab((tab) => {
-				if (tab) {
-					sendMessage(tab.id, 'appsPageData', {
-						blocked: conf.selected_app_ids[message.id] === 1
-					});
-				}
-			});
-		}
-	} else if (name === 'panelSelectedAppsUpdate') {
-		// This lets the user block trackers from https://apps.ghostery.com
-		const { selected_app_ids } = conf;
-		if (message.app_selected) {
-			selected_app_ids[message.app_id] = 1;
-		} else {
-			delete selected_app_ids[message.app_id];
-		}
-
-		conf.selected_app_ids = selected_app_ids;
-	}
-	return false;
-}
-
 /**
  * Handle messages sent from app/js/notifications.js content script.
  *
@@ -673,10 +636,6 @@ function onMessageHandler(request, sender, callback) {
 		// Purplebox script events
 		return handlePurplebox(name, message, tab_id, callback);
 	}
-	if (origin === 'ghostery_dot_com') {
-		// Ghostery.com and apps pages
-		return handleGhosteryDotCom(name, message, tab_id);
-	}
 	if (origin === 'page_performance' && name === 'recordPageInfo') {
 		tabInfo.setTabInfo(tab_id, 'pageTiming', message.performanceAPI);
 		panelData.postPageLoadTime(tab_id);
@@ -1348,11 +1307,9 @@ function initializeEventListeners() {
 	// Fires when a request is about to send headers
 	chrome.webRequest.onBeforeSendHeaders.addListener(Events.onBeforeSendHeaders.bind(events), {
 		urls: [
-			'https://l.ghostery.com/*',
 			'https://d.ghostery.com/*',
 			'https://cmp-cdn.ghostery.com/*',
 			'https://cdn.ghostery.com/*',
-			'https://apps.ghostery.com/*',
 			'https://gcache.ghostery.com/*'
 		]
 	}, ['requestHeaders', 'blocking']);
diff --git a/src/classes/EventHandlers.js b/src/classes/EventHandlers.js
index bd3c35016..cfbce2bdf 100644
--- a/src/classes/EventHandlers.js
+++ b/src/classes/EventHandlers.js
@@ -638,14 +638,14 @@ class EventHandlers {
 				};
 			}
 		} else if (fromRedirect) {
-			const url = buildRedirectC2P(globals.REDIRECT_MAP.get(requestId), appId);
-			setTimeout(() => {
-				chrome.tabs.update(details.tabId, { url });
-			}, 0);
+			buildRedirectC2P(globals.REDIRECT_MAP.get(requestId), appId).then((url) => {
+				setTimeout(() => {
+					chrome.tabs.update(details.tabId, { url });
+				}, 0);
+			});
 		}
-
 		return {
-			// If true, the request is cancelled. This prevents the request from being sent.
+			// If true, the request is canceled. This prevents the request from being sent.
 			cancel: true
 		};
 	}
diff --git a/src/classes/Globals.js b/src/classes/Globals.js
index f8a5df397..6ba7ad2a4 100644
--- a/src/classes/Globals.js
+++ b/src/classes/Globals.js
@@ -57,7 +57,6 @@ class Globals {
 		this.METRICS_BASE_URL = `https://${this.DEBUG ? 'staging-d' : 'd'}.ghostery.com`;
 		this.CMP_BASE_URL = `https://${this.DEBUG ? 'staging-cmp-cdn' : 'cmp-cdn'}.ghostery.com`;
 		this.CDN_BASE_URL = `https://${this.DEBUG ? 'staging-cdn' : 'cdn'}.ghostery.com`;
-		this.APPS_BASE_URL = `https://${this.DEBUG ? 'staging-apps' : 'apps'}.ghostery.com`;
 		this.WTM_BASE_URL = 'https://www.whotracks.me';
 		this.GCACHE_BASE_URL = `https://${this.DEBUG ? 'staging-gcache' : 'gcache'}.ghostery.com`;
 		this.AUTH_SERVER = `https://consumerapi.${this.GHOSTERY_ROOT_DOMAIN}`;
diff --git a/src/utils/click2play.js b/src/utils/click2play.js
index 4f2b10ea0..bd37d1ead 100644
--- a/src/utils/click2play.js
+++ b/src/utils/click2play.js
@@ -19,7 +19,12 @@ import globals from '../classes/Globals';
 import Policy from '../classes/Policy';
 import tabInfo from '../classes/TabInfo';
 import { log } from './common';
-import { sendMessage, processUrl, injectScript } from './utils';
+import {
+	sendMessage,
+	processUrl,
+	injectScript,
+	getJson
+} from './utils';
 import c2p_tpl from '../../app/templates/click2play.html';
 import c2p_images from '../../app/data-images/click2play';
 
@@ -176,7 +181,7 @@ export function buildC2P(details, app_id) {
  * @param  {Object}		redirectUrls	original url and redirect url as properties
  * @param  {number}		app_id 			tracker id
  *
- * @return {string}  					url of the internal template of the blocked redirect page
+ * @return {Promise}  					url of the internal template of the blocked redirect page
  */
 export function buildRedirectC2P(redirectUrls, app_id) {
 	const host_url = processUrl(redirectUrls.url).hostname;
@@ -188,19 +193,25 @@ export function buildRedirectC2P(redirectUrls, app_id) {
 	globals.BLOCKED_REDIRECT_DATA.url = redirectUrls.redirectUrl;
 	globals.BLOCKED_REDIRECT_DATA.blacklisted = !!Policy.blacklisted(host_url);
 
-	globals.BLOCKED_REDIRECT_DATA.translations = {
-		blocked_redirect_page_title: t('blocked_redirect_page_title'),
-		blocked_redirect_prevent: t(
-			'blocked_redirect_prevent',
-			// It is unlikely that apps pages will ever be translated
-			// [host_url, redirect_url, app_name, 'https://' + globals.APPS_SUB_DOMAIN + '.ghostery.com/' + conf.language + '/apps/' + encodeURIComponent(app_name.replace(/\s+/g, '_').toLowerCase())]),
-			[host_url, redirect_url, app_name, `${globals.APPS_BASE_URL}/en/apps/${encodeURIComponent(app_name.replace(/\s+/g, '_').toLowerCase())}`]
-		),
-		blocked_redirect_action_always_title: t('blocked_redirect_action_always_title'),
-		blocked_redirect_action_through_once_title: t('blocked_redirect_action_through_once_title'),
-		blocked_redirect_url_content: t('blocked_redirect_url_content', [redirectUrls.redirectUrl, app_name])
-	};
-	return chrome.extension.getURL('app/templates/blocked_redirect.html');
+	return getJson(`${globals.WTM_BASE_URL}/data/trackers/ghostery/${app_id}.json`).catch(() => {
+		log('Tracker not found on whotracks.me');
+	}).then((data) => {
+		let wtmURL = globals.WTM_BASE_URL;
+		if (data && data.id) {
+			wtmURL += `/trackers/${encodeURIComponent(data.id).toLowerCase()}`;
+		}
+		globals.BLOCKED_REDIRECT_DATA.translations = {
+			blocked_redirect_page_title: t('blocked_redirect_page_title'),
+			blocked_redirect_prevent: t(
+				'blocked_redirect_prevent',
+				[host_url, redirect_url, app_name, wtmURL]
+			),
+			blocked_redirect_action_always_title: t('blocked_redirect_action_always_title'),
+			blocked_redirect_action_through_once_title: t('blocked_redirect_action_through_once_title'),
+			blocked_redirect_url_content: t('blocked_redirect_url_content', [redirectUrls.redirectUrl, app_name])
+		};
+		return chrome.extension.getURL('app/templates/blocked_redirect.html');
+	});
 }
 
 /**
diff --git a/webpack.config.js b/webpack.config.js
index b8c0f24a7..6dc791712 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -49,7 +49,6 @@ module.exports = {
 		checkout_pages: [`${CONTENT_SCRIPTS_DIR}/checkout_pages.js`],
 		click_to_play: [`${CONTENT_SCRIPTS_DIR}/click_to_play.js`],
 		content_script_bundle: [`${CONTENT_SCRIPTS_DIR}/content_script_bundle.js`],
-		ghostery_dot_com: [`${CONTENT_SCRIPTS_DIR}/ghostery_dot_com.js`],
 		hub_react: [`${HUB_DIR}/index.jsx`],
 		licenses_react: [`${LICENSES_DIR}/Licenses.jsx`, `${LICENSES_DIR}/License.jsx`],
 		notifications: [`${CONTENT_SCRIPTS_DIR}/notifications.js`],
@@ -61,7 +60,6 @@ module.exports = {
 		// Sass
 		foundation: [`${SASS_DIR}/vendor/foundation.scss`],
 		foundation_hub: [`${SASS_DIR}/vendor/foundation_hub.scss`],
-		ghostery_dot_com_css: [`${SASS_DIR}/ghostery_dot_com.scss`],
 		hub: [`${SASS_DIR}/hub.scss`],
 		licenses: [`${SASS_DIR}/licenses.scss`],
 		panel: [`${SASS_DIR}/panel.scss`],
@@ -88,7 +86,6 @@ module.exports = {
 			onBuildExit: [
 				`${RM} ./dist/foundation.js`,
 				`${RM} ./dist/foundation_hub.js`,
-				`${RM} ./dist/ghostery_dot_com_css.js`,
 				`${RM} ./dist/hub.js`,
 				`${RM} ./dist/licenses.js`,
 				`${RM} ./dist/panel.js`,

From 75487fcedc99dc95873689618c83f1378139fdea Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Tue, 5 Jan 2021 16:42:34 -0500
Subject: [PATCH 6/8] leverage new trackerID property in bugs.json for WTM
 links

---
 .../components/Blocking/GlobalTracker.jsx     |  5 +--
 app/panel/components/Blocking/Tracker.jsx     |  5 +--
 databases/bugs.json                           | 15 ++++---
 src/classes/BugDb.js                          |  1 +
 src/classes/EventHandlers.js                  |  9 ++--
 src/classes/FoundBugs.js                      |  8 +++-
 src/classes/PanelData.js                      |  2 +
 src/utils/click2play.js                       | 42 +++++++------------
 8 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/app/panel/components/Blocking/GlobalTracker.jsx b/app/panel/components/Blocking/GlobalTracker.jsx
index 8dffa4adf..ad7de407c 100644
--- a/app/panel/components/Blocking/GlobalTracker.jsx
+++ b/app/panel/components/Blocking/GlobalTracker.jsx
@@ -33,7 +33,6 @@ class GlobalTracker extends React.Component {
 			description: '',
 			showMoreInfo: false,
 			showTrackerLearnMore: false,
-			wtmID: null,
 		};
 
 		// click bindings
@@ -64,7 +63,6 @@ class GlobalTracker extends React.Component {
 				const truncate = (data.description.length > 200) ? `${data.description.substr(0, 199)}...` : data.description;
 				this.setState({ description: truncate });
 				this.setState({ showTrackerLearnMore: true });
-				this.setState({ wtmID: data.id });
 			} else {
 				this.setState({ description: t('tracker_description_none_found') });
 			}
@@ -105,7 +103,6 @@ class GlobalTracker extends React.Component {
 			showMoreInfo,
 			description,
 			showTrackerLearnMore,
-			wtmID
 		} = this.state;
 		return (
 			<div className="global-blocking-trk">
@@ -125,7 +122,7 @@ class GlobalTracker extends React.Component {
 								{
 									showTrackerLearnMore && (
 										<div className={(!showTrackerLearnMore ? 'hide' : '')}>
-											<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(wtmID).toLowerCase()}.html`}>
+											<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(tracker.trackerID).toLowerCase()}.html`}>
 												{ t('tracker_description_learn_more') }
 											</a>
 										</div>
diff --git a/app/panel/components/Blocking/Tracker.jsx b/app/panel/components/Blocking/Tracker.jsx
index 3f2740796..08257bd69 100644
--- a/app/panel/components/Blocking/Tracker.jsx
+++ b/app/panel/components/Blocking/Tracker.jsx
@@ -35,7 +35,6 @@ class Tracker extends React.Component {
 			showTrackerLearnMore: false,
 			trackerClasses: '',
 			warningImageTitle: '',
-			wtmID: null,
 		};
 
 		// click bindings
@@ -160,7 +159,6 @@ class Tracker extends React.Component {
 				const truncate = (data.description.length > 200) ? `${data.description.substr(0, 199)}...` : data.description;
 				this.setState({ description: truncate });
 				this.setState({ showTrackerLearnMore: true });
-				this.setState({ wtmID: data.id });
 			} else {
 				this.setState({ description: t('tracker_description_none_found') });
 			}
@@ -336,7 +334,6 @@ class Tracker extends React.Component {
 			warningImageTitle,
 			showMoreInfo,
 			showTrackerLearnMore,
-			wtmID,
 		} = this.state;
 
 		let sources;
@@ -402,7 +399,7 @@ class Tracker extends React.Component {
 								<div className="trk-description">
 									{description}
 									<div className={(!showTrackerLearnMore ? 'hide' : '')}>
-										<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(wtmID).toLowerCase()}.html`}>
+										<a target="_blank" rel="noopener noreferrer" title={tracker.name} href={`${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(tracker.trackerID).toLowerCase()}.html`}>
 											{t('tracker_description_learn_more')}
 										</a>
 									</div>
diff --git a/databases/bugs.json b/databases/bugs.json
index b89a0406a..b47942a29 100644
--- a/databases/bugs.json
+++ b/databases/bugs.json
@@ -2,23 +2,28 @@
 	"apps": {
 		"1": {
 			"name": "DoubleClick",
-			"cat": "advertising"
+			"cat": "advertising",
+			"trackerID": "doubleclick"
 		},
 		"2": {
 			"name": "Google Analytics",
-			"cat": "site_analytics"
+			"cat": "site_analytics",
+			"trackerID": "google_analytics"
 		},
 		"3": {
 			"name": "Google Safeframe",
-			"cat": "advertising"
+			"cat": "advertising",
+			"trackerID": "google_safeframe"
 		},
 		"4": {
 			"name": "Google IMA",
-			"cat": "advertising"
+			"cat": "advertising",
+			"trackerID": "google_ima"
 		},
 		"5": {
 			"name": "Google Publisher Tags",
-			"cat": "advertising"
+			"cat": "advertising",
+			"trackerID": "google_publisher_tags"
 		}
 	},
 	"bugs": {
diff --git a/src/classes/BugDb.js b/src/classes/BugDb.js
index 84c8ee6af..d9b1186c1 100644
--- a/src/classes/BugDb.js
+++ b/src/classes/BugDb.js
@@ -118,6 +118,7 @@ class BugDb extends Updatable {
 				blocked,
 				shouldShow: true,
 				catId: category,
+				trackerID: db.apps[appId].trackerID,
 			});
 		}
 
diff --git a/src/classes/EventHandlers.js b/src/classes/EventHandlers.js
index cfbce2bdf..e873bc561 100644
--- a/src/classes/EventHandlers.js
+++ b/src/classes/EventHandlers.js
@@ -638,11 +638,10 @@ class EventHandlers {
 				};
 			}
 		} else if (fromRedirect) {
-			buildRedirectC2P(globals.REDIRECT_MAP.get(requestId), appId).then((url) => {
-				setTimeout(() => {
-					chrome.tabs.update(details.tabId, { url });
-				}, 0);
-			});
+			const url = buildRedirectC2P(globals.REDIRECT_MAP.get(requestId), appId);
+			setTimeout(() => {
+				chrome.tabs.update(details.tabId, { url });
+			}, 0);
 		}
 		return {
 			// If true, the request is canceled. This prevents the request from being sent.
diff --git a/src/classes/FoundBugs.js b/src/classes/FoundBugs.js
index 73332e226..85c9c75ac 100644
--- a/src/classes/FoundBugs.js
+++ b/src/classes/FoundBugs.js
@@ -53,7 +53,8 @@ class FoundBugs {
 	 *					blocked: boolean,
 	 *					type: string,
 	 *					request_id: string
-	 *				}]
+	 *				}],
+	 *				trackerID: string
 	 *			}],
 	 *			appsMetadata: {
 	 *				appId: {
@@ -210,6 +211,7 @@ class FoundBugs {
 					cats_obj[cid].trackers.push({
 						id: appid,
 						name: db.apps[appid].name,
+						trackerID: db.apps[appid].trackerID,
 						blocked: bugs[id].blocked
 					});
 					if (bugs[id].blocked) {
@@ -227,6 +229,7 @@ class FoundBugs {
 					trackers: [{
 						id: appid,
 						name: db.apps[appid].name,
+						trackerID: db.apps[appid].trackerID,
 						blocked: bugs[id].blocked
 					}],
 					blocked: (bugs[id].blocked ? 1 : 0),
@@ -496,12 +499,13 @@ class FoundBugs {
 			appsMetadata[aid].needsCompatibilityCheck =
 				appsMetadata[aid].needsCompatibilityCheck && app.blocked;
 		} else {
-			const { name, cat } = db.apps[aid];
+			const { name, cat, trackerID } = db.apps[aid];
 
 			const apps_len = apps.push({
 				id: aid,
 				name,
 				cat,
+				trackerID,
 				blocked,
 				sources,
 				hasCompatibilityIssue: false,
diff --git a/src/classes/PanelData.js b/src/classes/PanelData.js
index ca064247d..a3e1e5866 100644
--- a/src/classes/PanelData.js
+++ b/src/classes/PanelData.js
@@ -704,6 +704,7 @@ class PanelData {
 			id,
 			name,
 			sources,
+			trackerID,
 		} = tracker;
 		const { blocked, ss_allowed, ss_blocked } = trackerState;
 
@@ -717,6 +718,7 @@ class PanelData {
 			shouldShow: true, // used for filtering tracker list
 			catId: cat,
 			sources,
+			trackerID,
 			warningCompatibility: hasCompatibilityIssue,
 			warningInsecure: hasInsecureIssue,
 			warningSlow: hasLatencyIssue,
diff --git a/src/utils/click2play.js b/src/utils/click2play.js
index bd37d1ead..cfe78c6b9 100644
--- a/src/utils/click2play.js
+++ b/src/utils/click2play.js
@@ -19,12 +19,7 @@ import globals from '../classes/Globals';
 import Policy from '../classes/Policy';
 import tabInfo from '../classes/TabInfo';
 import { log } from './common';
-import {
-	sendMessage,
-	processUrl,
-	injectScript,
-	getJson
-} from './utils';
+import { sendMessage, processUrl, injectScript } from './utils';
 import c2p_tpl from '../../app/templates/click2play.html';
 import c2p_images from '../../app/data-images/click2play';
 
@@ -181,37 +176,30 @@ export function buildC2P(details, app_id) {
  * @param  {Object}		redirectUrls	original url and redirect url as properties
  * @param  {number}		app_id 			tracker id
  *
- * @return {Promise}  					url of the internal template of the blocked redirect page
+ * @return {string}  					url of the internal template of the blocked redirect page
  */
 export function buildRedirectC2P(redirectUrls, app_id) {
 	const host_url = processUrl(redirectUrls.url).hostname;
 	const redirect_url = processUrl(redirectUrls.redirectUrl).hostname;
-	const app_name = bugDb.db.apps[app_id].name;
+	const { name, trackerID } = bugDb.db.apps[app_id].trackerID;
+	const wtmURL = `${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(trackerID).toLowerCase()}`;
 
 	globals.BLOCKED_REDIRECT_DATA = {};
 	globals.BLOCKED_REDIRECT_DATA.app_id = app_id;
 	globals.BLOCKED_REDIRECT_DATA.url = redirectUrls.redirectUrl;
 	globals.BLOCKED_REDIRECT_DATA.blacklisted = !!Policy.blacklisted(host_url);
 
-	return getJson(`${globals.WTM_BASE_URL}/data/trackers/ghostery/${app_id}.json`).catch(() => {
-		log('Tracker not found on whotracks.me');
-	}).then((data) => {
-		let wtmURL = globals.WTM_BASE_URL;
-		if (data && data.id) {
-			wtmURL += `/trackers/${encodeURIComponent(data.id).toLowerCase()}`;
-		}
-		globals.BLOCKED_REDIRECT_DATA.translations = {
-			blocked_redirect_page_title: t('blocked_redirect_page_title'),
-			blocked_redirect_prevent: t(
-				'blocked_redirect_prevent',
-				[host_url, redirect_url, app_name, wtmURL]
-			),
-			blocked_redirect_action_always_title: t('blocked_redirect_action_always_title'),
-			blocked_redirect_action_through_once_title: t('blocked_redirect_action_through_once_title'),
-			blocked_redirect_url_content: t('blocked_redirect_url_content', [redirectUrls.redirectUrl, app_name])
-		};
-		return chrome.extension.getURL('app/templates/blocked_redirect.html');
-	});
+	globals.BLOCKED_REDIRECT_DATA.translations = {
+		blocked_redirect_page_title: t('blocked_redirect_page_title'),
+		blocked_redirect_prevent: t(
+			'blocked_redirect_prevent',
+			[host_url, redirect_url, name, wtmURL]
+		),
+		blocked_redirect_action_always_title: t('blocked_redirect_action_always_title'),
+		blocked_redirect_action_through_once_title: t('blocked_redirect_action_through_once_title'),
+		blocked_redirect_url_content: t('blocked_redirect_url_content', [redirectUrls.redirectUrl, name])
+	};
+	return chrome.extension.getURL('app/templates/blocked_redirect.html');
 }
 
 /**

From 7958c6672c211cd43cb247cb55fd5250ca229922 Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Tue, 5 Jan 2021 16:59:44 -0500
Subject: [PATCH 7/8] update unit tests

---
 src/utils/click2play.js    |  2 +-
 test/src/BugDB.test.js     | 10 +++++++---
 test/src/Foundbugs.test.js |  6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/utils/click2play.js b/src/utils/click2play.js
index cfe78c6b9..a3b63d314 100644
--- a/src/utils/click2play.js
+++ b/src/utils/click2play.js
@@ -181,7 +181,7 @@ export function buildC2P(details, app_id) {
 export function buildRedirectC2P(redirectUrls, app_id) {
 	const host_url = processUrl(redirectUrls.url).hostname;
 	const redirect_url = processUrl(redirectUrls.redirectUrl).hostname;
-	const { name, trackerID } = bugDb.db.apps[app_id].trackerID;
+	const { name, trackerID } = bugDb.db.apps[app_id];
 	const wtmURL = `${globals.WTM_BASE_URL}/trackers/${encodeURIComponent(trackerID).toLowerCase()}`;
 
 	globals.BLOCKED_REDIRECT_DATA = {};
diff --git a/test/src/BugDB.test.js b/test/src/BugDB.test.js
index cee528927..458bc4b50 100644
--- a/test/src/BugDB.test.js
+++ b/test/src/BugDB.test.js
@@ -29,19 +29,23 @@ describe('src/classes/BugDb.js', () => {
 				"apps": {
 					"3": {
 						"name": "Clicky",
-						"cat": "site_analytics"
+						"cat": "site_analytics",
+						"trackerID": "clicky"
 					},
 					"5": {
 						"name": "Statisfy",
-						"cat": "site_analytics"
+						"cat": "site_analytics",
+						"trackerID": "statisfy"
 					},
 					"6": {
 						"name": "Google Widgets",
-						"cat": "customer_interaction"
+						"cat": "customer_interaction",
+						"trackerID": "google_widgets",
 					},
 					"8": {
 						"name": "Twitter Badge",
 						"cat": "social_media",
+						"trackerID": "twitter_badge",
 						"tags": [
 							39
 						]
diff --git a/test/src/Foundbugs.test.js b/test/src/Foundbugs.test.js
index 71b0567b6..30c1d92d8 100644
--- a/test/src/Foundbugs.test.js
+++ b/test/src/Foundbugs.test.js
@@ -42,9 +42,9 @@ describe('src/classes/FoundBugs.js', () => {
 		conf.init().then(() => {
 			//Start init sequence for testing. Changing the fakeServer() response each time for the following fetchJson() call
 			const bugsJson = JSON.stringify({
-				"apps": {"13": {"name": "Google Analytics","cat": "site_analytics","tags": [48]},
-				"464": {"name": "Facebook Social Plugins","cat": "social_media","tags": [39]},
-				"614": {"name": "New Relic","cat": "site_analytics","tags": [48]}},
+				"apps": {"13": {"name": "Google Analytics","cat": "site_analytics","trackerID": "google_analytics","tags": [48]},
+				"464": {"name": "Facebook Social Plugins","cat": "social_media","trackerID": "facebook_social_plugins","tags": [39]},
+				"614": {"name": "New Relic","cat": "site_analytics","trackerID": "new_relic","tags": [48]}},
 				"bugs": {"2": {"aid": 13},"935": {"aid": 13},"1982": {"aid": 13},"719": {"aid": 464},"1009": {"aid": 614}},
 				"firstPartyExceptions": {'something': true},
 				"patterns": { regex: { 'something': true} },

From 1726a1cdf1726cbfd359b5250dedf6227ed115b8 Mon Sep 17 00:00:00 2001
From: Christopher Tino <christopher_tino@yahoo.com>
Date: Tue, 5 Jan 2021 17:11:25 -0500
Subject: [PATCH 8/8] remove debug flag

---
 manifest.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 110e48c15..4700eb994 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,6 @@
 	"version_name": "8.5.5",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
-	"debug": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",