diff --git a/src/common/settings.ts b/src/common/settings.ts index 2200048..c5908c8 100644 --- a/src/common/settings.ts +++ b/src/common/settings.ts @@ -6,8 +6,9 @@ export interface ExtensionSettings { export const DEFAULT_SETTINGS: ExtensionSettings = { redirect: true, targetPlatform: 'odysee', urlResolver: 'lbryInc' }; -export function getExtensionSettingsAsync>(...keys: K): Promise> { - return new Promise(resolve => chrome.storage.local.get(keys, o => resolve(o as any))); +export function getExtensionSettingsAsync(): Promise +{ + return new Promise(resolve => chrome.storage.local.get(o => resolve(o as any))); } diff --git a/src/scripts/storageSetup.ts b/src/scripts/storageSetup.ts index f574108..7f90e83 100644 --- a/src/scripts/storageSetup.ts +++ b/src/scripts/storageSetup.ts @@ -2,7 +2,7 @@ import { DEFAULT_SETTINGS, ExtensionSettings, getExtensionSettingsAsync } from ' /** Reset settings to default value and update the browser badge text */ async function initSettings() { - const settings = await getExtensionSettingsAsync(...Object.keys(DEFAULT_SETTINGS) as Array); + const settings = await getExtensionSettingsAsync(); // get all the values that aren't set and use them as a change set const invalidEntries = (Object.entries(DEFAULT_SETTINGS) as Array<[keyof ExtensionSettings, ExtensionSettings[keyof ExtensionSettings]]>) diff --git a/src/scripts/tabOnUpdated.ts b/src/scripts/tabOnUpdated.ts index 06e3644..ae767b9 100644 --- a/src/scripts/tabOnUpdated.ts +++ b/src/scripts/tabOnUpdated.ts @@ -33,7 +33,7 @@ async function ctxFromURL(href: string): Promise { const res = await resolveYT(descriptor) if (!res) return // couldn't find it on lbry, so we're done - const { redirect, targetPlatform } = await getExtensionSettingsAsync('redirect', 'targetPlatform') + const { redirect, targetPlatform } = await getExtensionSettingsAsync() return { descriptor, lbryPathname: res, redirect, targetPlatform } })()) await promise diff --git a/src/scripts/ytContent.tsx b/src/scripts/ytContent.tsx index 86e9f99..f1fd9b1 100644 --- a/src/scripts/ytContent.tsx +++ b/src/scripts/ytContent.tsx @@ -168,7 +168,7 @@ async function onPageLoad() history.pushState = function(...params) { onPushState(); return originalPushState(...params) } } - const settings = await getExtensionSettingsAsync('redirect', 'targetPlatform', 'urlResolver') + const settings = await getExtensionSettingsAsync() // Listen Settings Change chrome.storage.onChanged.addListener(async (changes, areaName) => {