diff --git a/src/background.js b/src/background.js
index 12653ed..0b9d22d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -111,11 +111,26 @@ async function start() {
return {
requestHeaders,
};
- }, { urls: [`${SERP_BASE_URL}/search*`]}, ["blocking", "requestHeaders"]);
+ }, { urls: [`${SERP_BASE_URL}/search*`, USE_STAGING ? 'https://staging.ghosterysearch.com/search*' : 'https://ghosterysearch.com/search*']}, ["blocking", "requestHeaders"]);
+
+ // TODO: this should only run in Ghostery Dawn
+ browser.webRequest.onBeforeSendHeaders.addListener(async (details) => {
+ const { requestHeaders } = details;
+ requestHeaders.push({
+ name: "SERP-browser",
+ value: "Ghostery Dawn",
+ });
+ return {
+ requestHeaders,
+ };
+ }, { urls: [`${SERP_BASE_URL}/*`, USE_STAGING ? 'https://staging.ghosterysearch.com/search*' : 'https://ghosterysearch.com/search*']}, ["blocking", "requestHeaders"]);
}
browser.runtime.onMessage.addListener(async ({ action, args }, { tab }) => {
if (action === 'getTopSites') {
+ if (tab.incognito) {
+ return;
+ }
return (await browser.topSites.get({
newtab: true,
includeFavicon: true,
diff --git a/src/config.js b/src/config.js
index 80ccbc3..2d731ec 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,6 +1,6 @@
let DEBUG = false;
-const STAGING_BASE_URL = 'https://staging.ghosterysearch.com';
-const PROD_BASE_URL = 'https://ghosterysearch.com';
+const STAGING_BASE_URL = 'https://staging.glowstery.com';
+const PROD_BASE_URL = 'https://glowstery.com';
const STAGING_AUTH_DOMAIN = '.ghosterystage.com';
const PROD_AUTH_DOMAIN = '.ghostery.com';
let API_BASE_URL = DEBUG ? 'http://localhost:5000' : PROD_BASE_URL;
@@ -18,7 +18,7 @@ const setupEndpoints = (async function() {
if (!DEBUG) {
API_BASE_URL = STAGING_BASE_URL;
SERP_BASE_URL = STAGING_BASE_URL;
- console.log(`USING_STAGING: Redirecting ghosterysearch.com to staging.ghosterysearch.com`)
+ console.log(`USING_STAGING: Redirecting glowstery.com to staging.glowstery.com`)
browser.webRequest.onBeforeRequest.addListener(async (details) => {
return {
redirectUrl: details.url.replace(PROD_BASE_URL, STAGING_BASE_URL),
diff --git a/src/favicon.ico b/src/favicon.ico
deleted file mode 100644
index 5ac20b4..0000000
Binary files a/src/favicon.ico and /dev/null differ
diff --git a/src/icon.svg b/src/icon.svg
new file mode 100644
index 0000000..6f2582c
--- /dev/null
+++ b/src/icon.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 8bd4cbd..e2365ab 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
{
- "version": "0.1.22",
+ "version": "0.2.0",
"browser_specific_settings": {
"gecko": {
"id": "search@ghostery.com"
@@ -21,6 +21,8 @@
"matches": [
"https://*.ghosterysearch.com/",
"https://*.ghosterysearch.com/?*",
+ "https://*.glowstery.com/",
+ "https://*.glowstery.com/?*",
"http://localhost/",
"http://localhost/?*"
],
@@ -31,6 +33,7 @@
}, {
"matches": [
"https://*.ghosterysearch.com/*",
+ "https://*.glowstery.com/*",
"http://localhost/*"
],
"js": [
@@ -39,12 +42,13 @@
}, {
"matches": [
"https://*.ghosterysearch.com/search*",
+ "https://*.glowstery.com/search*",
"http://localhost/search*"
],
"js": ["content/additional-search-engines.js"]
}],
"manifest_version": 2,
- "name": "Ghostery Search",
+ "name": "Ghostery Glow",
"permissions": [
"search",
"storage",
@@ -59,22 +63,25 @@
"https://consumerapi.ghosterystage.com/*",
"https://ghosterysearch.com/*",
"https://staging.ghosterysearch.com/*",
+ "https://glowstery.com/*",
+ "https://staging.glowstery.com/*",
"http://localhost/*"
],
"icons": {
- "16": "favicon.ico"
+ "48": "icon.svg",
+ "96": "icon.svg"
},
"web_accessible_resources": [
- "favicon.ico"
+ "icon.svg"
],
"chrome_settings_overrides" : {
"search_provider": {
- "name": "Ghostery Search",
- "search_url": "https://ghosterysearch.com/search?q={searchTerms}",
+ "name": "Ghostery Glow",
+ "search_url": "https://glowstery.com/search?q={searchTerms}",
"keyword": "@ghostery",
- "favicon_url": "https://ghosterysearch.com/img/favicon-32x32.png",
+ "favicon_url": "https://glowstery.com/img/favicon-32x32.png",
"is_default": true,
- "suggest_url": "https://ghosterysearch.com/suggest",
+ "suggest_url": "https://glowstery.com/suggest",
"suggest_url_get_params": "q={searchTerms}"
}
},
diff --git a/src/pages/choice-screen.html b/src/pages/choice-screen.html
index 952d822..8d0bb27 100644
--- a/src/pages/choice-screen.html
+++ b/src/pages/choice-screen.html
@@ -258,7 +258,7 @@ Pick a default search engine for all your searches.
-
+
diff --git a/src/pages/common.js b/src/pages/common.js
index 09b1aed..eb182c4 100644
--- a/src/pages/common.js
+++ b/src/pages/common.js
@@ -27,7 +27,7 @@ async function selectSearchEngine(name) {
});
if (name === browser.runtime.getManifest()["chrome_settings_overrides"]["search_provider"].name) {
browser.tabs.update(currentTab.id, {
- url: "https://ghosterysearch.com/account",
+ url: "https://glowstery.com/account",
});
} else {
await browser.tabs.create({});