Compare commits

..

No commits in common. "16ba17eb9c110e2681b13a2b16987c457d2089a9" and "a93b5ed92d801e318f3de50b7453b6459304bfb3" have entirely different histories.

5 changed files with 2 additions and 8 deletions

View File

@ -39,13 +39,13 @@ browser.webNavigation.onBeforeNavigate.addListener(async (details) => {
await browser.storage.local.get(), await browser.storage.local.get(),
)) { )) {
const redirect = parseRedirect(parameters, id); const redirect = parseRedirect(parameters, id);
if (redirect === undefined || !redirect.parameters.enabled) { if (redirect === undefined) {
continue; continue;
} }
if (redirect.isMatch(url)) { if (redirect.isMatch(url)) {
const redirectedUrl = redirect.redirect(url); const redirectedUrl = redirect.redirect(url);
await browser.tabs.update(details.tabId, {url: redirectedUrl.href}); await browser.tabs.update({url: redirectedUrl.href});
await browser.storage.local.set({ await browser.storage.local.set({
latestTime: Date.now(), latestTime: Date.now(),
latestUrl: url.href, latestUrl: url.href,

View File

@ -15,7 +15,6 @@ export function narrowRedirectType(value: string): value is RedirectType {
} }
export type RedirectParameters = { export type RedirectParameters = {
enabled: boolean;
matcherType: MatcherType; matcherType: MatcherType;
matcherValue: string; matcherValue: string;
redirectType: RedirectType; redirectType: RedirectType;

View File

@ -16,7 +16,6 @@ import {
} from '../source/redirect/exports.js'; } from '../source/redirect/exports.js';
const hostnameParameters: RedirectParameters = { const hostnameParameters: RedirectParameters = {
enabled: true,
matcherType: 'hostname', matcherType: 'hostname',
matcherValue: 'example.com', matcherValue: 'example.com',
redirectType: 'hostname', redirectType: 'hostname',
@ -24,7 +23,6 @@ const hostnameParameters: RedirectParameters = {
}; };
const simpleParameters: RedirectParameters = { const simpleParameters: RedirectParameters = {
enabled: true,
matcherType: 'hostname', matcherType: 'hostname',
matcherValue: 'example.com', matcherValue: 'example.com',
redirectType: 'simple', redirectType: 'simple',
@ -91,7 +89,6 @@ test('Redirect.isMatch', (t) => {
} as unknown as HostnameRedirect['parameters']); } as unknown as HostnameRedirect['parameters']);
const regexMatch = new HostnameRedirect({ const regexMatch = new HostnameRedirect({
enabled: true,
matcherType: 'regex', matcherType: 'regex',
matcherValue: String.raw`^https://(www\.)?example.org/$`, matcherValue: String.raw`^https://(www\.)?example.org/$`,
redirectType: 'simple', redirectType: 'simple',

View File

@ -11,7 +11,6 @@ Generated by [AVA](https://avajs.dev).
HostnameRedirect { HostnameRedirect {
id: 'id', id: 'id',
parameters: { parameters: {
enabled: true,
matcherType: 'hostname', matcherType: 'hostname',
matcherValue: 'example.com', matcherValue: 'example.com',
redirectType: 'hostname', redirectType: 'hostname',
@ -24,7 +23,6 @@ Generated by [AVA](https://avajs.dev).
SimpleRedirect { SimpleRedirect {
id: 'id', id: 'id',
parameters: { parameters: {
enabled: true,
matcherType: 'hostname', matcherType: 'hostname',
matcherValue: 'example.com', matcherValue: 'example.com',
redirectType: 'simple', redirectType: 'simple',