From 06395993b949c28133cab778cf007c6c40ee8a72 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 17 Aug 2019 23:25:04 -0700 Subject: [PATCH] Fix repetition of kissu.moe in package.json --- package.json | 10 +++++----- src/meta/manifest.json | 4 ++-- src/meta/metadata.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4dcf51336..516425980 100644 --- a/package.json +++ b/package.json @@ -43,18 +43,18 @@ "*://is.4chan.org/*", "*://is2.4chan.org/*", "*://is.4channel.org/*", - "*://is2.4channel.org/*", - "https://kissu.moe/*", - "https://www.kissu.moe/*" + "*://is2.4channel.org/*" ], "matches_only": [ "*://*.4chan.org/*", "*://*.4channel.org/*", - "*://*.4cdn.org/*", + "*://*.4cdn.org/*" + ], + "matches": [ "https://kissu.moe/*", "https://www.kissu.moe/*" ], - "matches": [ + "matches_extra": [ "https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*", "https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*", "https://www.google.com/recaptcha/api2/frame?*&k=887877714&*", diff --git a/src/meta/manifest.json b/src/meta/manifest.json index 8438753bb..1c82e9c8e 100644 --- a/src/meta/manifest.json +++ b/src/meta/manifest.json @@ -10,7 +10,7 @@ }, "content_scripts": [{ "js": ["script.js"], - "matches": <%= JSON.stringify(meta.matches_only.concat(meta.matches)) %>, + "matches": <%= JSON.stringify(meta.matches_only.concat(meta.matches, meta.matches_extra)) %>, "exclude_matches": <%= JSON.stringify(meta.exclude_matches) %>, "all_frames": true, "run_at": "document_start" @@ -23,7 +23,7 @@ <% if (channel !== '-noupdate') { %> "update_url": "<%= meta.downloads %>updates<%= channel %>.xml", "key": "<%= meta.appid %>", <% } %> "minimum_chrome_version": "<%= meta.min.chrome %>", - "permissions": <%= JSON.stringify(meta.matches_only.concat(["storage"])) %>, + "permissions": <%= JSON.stringify(meta.matches_only.concat(meta.matches, ["storage"])) %>, "optional_permissions": [ "*://*/" ], diff --git a/src/meta/metadata.js b/src/meta/metadata.js index 841a0273a..b5d287249 100644 --- a/src/meta/metadata.js +++ b/src/meta/metadata.js @@ -25,7 +25,7 @@ return expand(matches, /^\*/, ['http', 'https']); } return [].concat( - expandMatches(meta.includes_only.concat(meta.matches)).map(function(match) { + expandMatches(meta.includes_only.concat(meta.matches, meta.matches_extra)).map(function(match) { return '// @include ' + match; }), expandMatches(meta.exclude_matches).map(function(match) {