From 091693c15a97bc78fa15bfb9ad133345f21550fe Mon Sep 17 00:00:00 2001 From: neobooru <50623835+neobooru@users.noreply.github.com> Date: Mon, 1 Feb 2021 12:47:03 +0100 Subject: [PATCH] Fix addon not working with Firefox --- package.json | 2 +- src/Common.ts | 4 ++++ src/popup/App.vue | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bc1d5f5..35c7579 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "szuru-chrome", - "version": "0.6.0", + "version": "0.6.1", "description": "Import media from various sites into szurubooru.", "author": "neobooru", "license": "MIT", diff --git a/src/Common.ts b/src/Common.ts index efe4202..9baf203 100644 --- a/src/Common.ts +++ b/src/Common.ts @@ -30,3 +30,7 @@ export function getUrl(root: string, ...parts: string[]): string { } return url; } + +export function isChrome() { + return /Chrome/.test(navigator.userAgent); +} diff --git a/src/popup/App.vue b/src/popup/App.vue index aaad76a..1a5986c 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -100,7 +100,7 @@ import { ScrapedPost, ScrapedTag, ScrapeResults } from "neo-scraper"; import SzuruWrapper from "../SzuruWrapper"; import { Post, SzuruError } from "../SzuruTypes"; import { Config, SzuruSiteConfig } from "../Config"; -import { BrowserCommand, Message, getUrl } from "../Common"; +import { BrowserCommand, Message, getUrl, isChrome } from "../Common"; class ScrapedPostViewModel extends ScrapedPost { name: string = ""; @@ -324,6 +324,11 @@ export default Vue.extend({ } }); + let extraInfoSpec: WebRequest.OnBeforeSendHeadersOptions[] = ["requestHeaders", "blocking"]; + if (isChrome()) { + extraInfoSpec.push("extraHeaders" as any); + } + browser.webRequest.onBeforeSendHeaders.addListener( (details: WebRequest.OnBeforeSendHeadersDetailsType) => { let requestHeaders = details.requestHeaders ?? []; @@ -342,7 +347,7 @@ export default Vue.extend({ }; }, { urls: [""] }, - ["requestHeaders", "blocking", "extraHeaders" as any] + extraInfoSpec ); // Always call grabPost, even when there is no activeSite