Rebranding

README.md

@@ -1,6 +1,6 @@
-# Ghostery Search Extension
+# Ghostery Private Search Extension
 
-Makes glowstery.com a default search engine.
+Makes ghosterysearch.com a default search engine.
 
 ## Multiple platform support
 

manifests/chrome.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.1.0",
   "background": {
     "scripts": [
       "libs/browser-polyfill.js",
@@ -24,7 +24,8 @@
     "webRequestBlocking",
     "https://www.ghostery.com/*",
     "https://consumerapi.ghostery.com/*",
-    "https://glowstery.com/*"
+    "https://glowstery.com/*",
+    "https://ghosterysearch.com/*"
   ],
   "icons": {
     "16": "icon16.png",
@@ -39,11 +40,11 @@
   "chrome_settings_overrides" : {
     "search_provider": {
       "name": "Ghostery Private Search",
-      "search_url": "https://glowstery.com/search?q={searchTerms}",
-      "favicon_url":  "https://glowstery.com/favicon.ico",
+      "search_url": "https://ghosterysearch.com/search?q={searchTerms}",
+      "favicon_url":  "https://ghosterysearch.com/favicon.ico",
       "keyword": "@ghostery",
       "is_default": true,
-      "suggest_url": "https://glowstery.com/suggest",
+      "suggest_url": "https://ghosterysearch.com/suggest",
       "suggest_url_get_params": "q={searchTerms}",
       "encoding": "UTF-8"
     }

manifests/firefox.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.2",
+  "version": "1.1.0",
   "browser_specific_settings": {
     "gecko": {
       "id": "search@ghostery.com"
@@ -19,12 +19,6 @@
     "default_icon": "icon.svg",
     "default_title": "Ghostery Private Search"
   },
-  "content_scripts": [{
-    "matches": [
-      "https://*.glowstery.com/search*"
-    ],
-    "js": ["content/additional-search-engines.js"]
-  }],
   "manifest_version": 2,
   "name": "Ghostery Private Search for Firefox",
   "permissions": [
@@ -35,7 +29,8 @@
     "webRequestBlocking",
     "https://www.ghostery.com/*",
     "https://consumerapi.ghostery.com/*",
-    "https://glowstery.com/*"
+    "https://glowstery.com/*",
+    "https://ghosterysearch.com/*"
   ],
   "icons": {
     "16": "icon16.png",
@@ -50,11 +45,11 @@
   "chrome_settings_overrides" : {
     "search_provider": {
       "name": "Ghostery Private Search",
-      "search_url": "https://glowstery.com/search?q={searchTerms}",
-      "favicon_url":  "https://glowstery.com/favicon.ico",
+      "search_url": "https://ghosterysearch.com/search?q={searchTerms}",
+      "favicon_url":  "https://ghosterysearch.com/favicon.ico",
       "keyword": "@ghostery",
       "is_default": true,
-      "suggest_url": "https://glowstery.com/suggest",
+      "suggest_url": "https://ghosterysearch.com/suggest",
       "suggest_url_get_params": "q={searchTerms}"
     }
   }

manifests/ghostery.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.1.0",
   "browser_specific_settings": {
     "gecko": {
       "id": "search@ghostery.com"
@@ -23,18 +23,6 @@
     "default_title": "Ghostery Private Search"
   },
   "content_scripts": [{
-    "matches": [
-      "https://*.ghosterysearch.com/",
-      "https://*.ghosterysearch.com/?*",
-      "https://*.glowstery.com/",
-      "https://*.glowstery.com/?*",
-      "http://localhost/",
-      "http://localhost/?*"
-    ],
-    "js": [
-      "content/top-sites.js"
-    ]
-  }, {
     "matches": [
       "https://*.ghosterysearch.com/*",
       "https://*.glowstery.com/*",
@@ -43,13 +31,6 @@
     "js": [
       "content/is-ghostery-browser.js"
     ]
-  }, {
-    "matches": [
-      "https://*.ghosterysearch.com/search*",
-      "https://*.glowstery.com/search*",
-      "http://localhost/search*"
-    ],
-    "js": ["content/additional-search-engines.js"]
   }],
   "manifest_version": 2,
   "name": "Ghostery Private Search",
@@ -84,11 +65,11 @@
   "chrome_settings_overrides" : {
     "search_provider": {
       "name": "Ghostery Private Search",
-      "search_url": "https://glowstery.com/search?q={searchTerms}",
-      "favicon_url":  "https://glowstery.com/favicon.ico",
+      "search_url": "https://ghosterysearch.com/search?q={searchTerms}",
+      "favicon_url":  "https://ghosterysearch.com/favicon.ico",
       "keyword": "@ghostery",
       "is_default": true,
-      "suggest_url": "https://glowstery.com/suggest",
+      "suggest_url": "https://ghosterysearch.com/suggest",
       "suggest_url_get_params": "q={searchTerms}"
     }
   },

src/browser-action.js

@@ -1,5 +1,5 @@
 browser.browserAction.onClicked.addListener(() => {
   browser.tabs.create({
-    url: "https://glowstery.com",
+    url: "https://ghosterysearch.com",
   });
 });

src/config.js

@@ -1,6 +1,6 @@
 let DEBUG = false;
-const STAGING_BASE_URL = 'https://staging.glowstery.com';
-const PROD_BASE_URL = 'https://glowstery.com';
+const STAGING_BASE_URL = 'https://staging.ghosterysearch.com';
+const PROD_BASE_URL = 'https://ghosterysearch.com';
 const STAGING_AUTH_DOMAIN = '.ghosterystage.com';
 const PROD_AUTH_DOMAIN = '.ghostery.com';
 let API_BASE_URL = DEBUG ? 'http://localhost:5000' : PROD_BASE_URL;
@@ -25,7 +25,7 @@ const setupEndpoints = (async function() {
     if (!DEBUG) {
       API_BASE_URL = STAGING_BASE_URL;
       SERP_BASE_URL = STAGING_BASE_URL;
-      console.log(`USING_STAGING: Redirecting glowstery.com to staging.glowstery.com`)
+      console.log(`USING_STAGING: Redirecting ghosterysearch.com to staging.ghosterysearch.com`)
       browser.webRequest.onBeforeRequest.addListener(async (details) => {
         return {
           redirectUrl: details.url.replace(PROD_BASE_URL, STAGING_BASE_URL),

src/metrics.js

@@ -1,6 +1,7 @@
 // limit engines we can send to the specific set we're interested in from search choice screen
 const searchEngineMap = {
   "Ghostery Private Search": "ghostery",
+  Brave: "brave",
   Bing: "bing",
   DuckDuckGo: "ddg",
   Ecosia: "ecosia",