diff --git a/plugins/adblocker/back.ts b/plugins/adblocker/back.ts index f02f28a0..d33771ae 100644 --- a/plugins/adblocker/back.ts +++ b/plugins/adblocker/back.ts @@ -1,14 +1,14 @@ import { BrowserWindow } from 'electron'; import { loadAdBlockerEngine } from './blocker'; -import config from './config'; +import { shouldUseBlocklists } from './config'; import type { ConfigType } from '../../config/dynamic'; type AdBlockOptions = ConfigType<'adblocker'>; export default async (win: BrowserWindow, options: AdBlockOptions) => { - if (await config.shouldUseBlocklists()) { + if (await shouldUseBlocklists()) { loadAdBlockerEngine( win.webContents.session, options.cache, diff --git a/plugins/adblocker/preload.ts b/plugins/adblocker/preload.ts index 9885df46..33cb6b14 100644 --- a/plugins/adblocker/preload.ts +++ b/plugins/adblocker/preload.ts @@ -4,6 +4,7 @@ export default async () => { if (await config.shouldUseBlocklists()) { // Preload adblocker to inject scripts/styles require('@cliqz/adblocker-electron-preload'); + // eslint-disable-next-line @typescript-eslint/await-thenable } else if ((await config.get('blocker')) === config.blockers.InPlayer) { require('./inject.js'); } diff --git a/plugins/captions-selector/front.ts b/plugins/captions-selector/front.ts index ee9adc53..bba57e0a 100644 --- a/plugins/captions-selector/front.ts +++ b/plugins/captions-selector/front.ts @@ -7,6 +7,7 @@ import configProvider from './config'; import { ElementFromFile, templatePath } from '../utils'; import { YoutubePlayer } from '../../types/youtube-player'; + import type { ConfigType } from '../../config/dynamic'; interface LanguageOptions { diff --git a/plugins/crossfade/front.ts b/plugins/crossfade/front.ts index 203ddbb0..746fe0cd 100644 --- a/plugins/crossfade/front.ts +++ b/plugins/crossfade/front.ts @@ -10,6 +10,7 @@ import { VolumeFader } from './fader'; import configProvider from './config'; import defaultConfigs from '../../config/defaults'; + import type { ConfigType } from '../../config/dynamic'; let transitionAudio: Howl; // Howler audio used to fade out the current music diff --git a/plugins/crossfade/menu.ts b/plugins/crossfade/menu.ts index dd0057f2..fbfa4f0b 100644 --- a/plugins/crossfade/menu.ts +++ b/plugins/crossfade/menu.ts @@ -6,6 +6,7 @@ import config from './config'; import promptOptions from '../../providers/prompt-options'; import configOptions from '../../config/defaults'; + import type { ConfigType } from '../../config/dynamic'; const defaultOptions = configOptions.plugins.crossfade; diff --git a/plugins/discord/back.ts b/plugins/discord/back.ts index a505934d..8fa2f643 100644 --- a/plugins/discord/back.ts +++ b/plugins/discord/back.ts @@ -5,6 +5,7 @@ import { dev } from 'electron-is'; import { SetActivity } from '@xhayper/discord-rpc/dist/structures/ClientUser'; import registerCallback from '../../providers/song-info'; + import type { ConfigType } from '../../config/dynamic'; // Application ID registered by @Zo-Bro-23 diff --git a/plugins/last-fm/back.ts b/plugins/last-fm/back.ts index 69a93cc6..a307b87c 100644 --- a/plugins/last-fm/back.ts +++ b/plugins/last-fm/back.ts @@ -4,6 +4,7 @@ import md5 from 'md5'; import { setOptions } from '../../config/plugins'; import registerCallback, { SongInfo } from '../../providers/song-info'; import defaultConfig from '../../config/defaults'; + import type { ConfigType } from '../../config/dynamic'; type LastFMOptions = ConfigType<'last-fm'>; diff --git a/plugins/notifications/menu.ts b/plugins/notifications/menu.ts index 48bbaafd..127d287a 100644 --- a/plugins/notifications/menu.ts +++ b/plugins/notifications/menu.ts @@ -1,6 +1,6 @@ import is from 'electron-is'; -import {BrowserWindow, MenuItem} from 'electron'; +import { BrowserWindow, MenuItem } from 'electron'; import { snakeToCamel, ToastStyles, urgencyLevels } from './utils'; diff --git a/plugins/picture-in-picture/menu.ts b/plugins/picture-in-picture/menu.ts index ff154698..e8f877d6 100644 --- a/plugins/picture-in-picture/menu.ts +++ b/plugins/picture-in-picture/menu.ts @@ -5,9 +5,11 @@ import { BrowserWindow } from 'electron'; import { setOptions } from './back'; import promptOptions from '../../providers/prompt-options'; -import type { ConfigType } from '../../config/dynamic'; + import { MenuTemplate } from '../../menu'; +import type { ConfigType } from '../../config/dynamic'; + export default (win: BrowserWindow, options: ConfigType<'picture-in-picture'>): MenuTemplate => [ { label: 'Always on top', diff --git a/plugins/precise-volume/back.ts b/plugins/precise-volume/back.ts index e4ef4ea9..2e8ea70a 100644 --- a/plugins/precise-volume/back.ts +++ b/plugins/precise-volume/back.ts @@ -3,6 +3,7 @@ import path from 'node:path'; import { globalShortcut, BrowserWindow } from 'electron'; import { injectCSS } from '../utils'; + import type { ConfigType } from '../../config/dynamic'; /* diff --git a/plugins/shortcuts/menu.ts b/plugins/shortcuts/menu.ts index b5bc2471..68854fe7 100644 --- a/plugins/shortcuts/menu.ts +++ b/plugins/shortcuts/menu.ts @@ -3,11 +3,13 @@ import prompt, { KeybindOptions } from 'custom-electron-prompt'; import { BrowserWindow } from 'electron'; import { setMenuOptions } from '../../config/plugins'; -import type { ConfigType } from '../../config/dynamic'; + import promptOptions from '../../providers/prompt-options'; import { MenuTemplate } from '../../menu'; +import type { ConfigType } from '../../config/dynamic'; + export default (win: BrowserWindow, options: ConfigType<'shortcuts'>): MenuTemplate => [ { label: 'Set Global Song Controls', diff --git a/plugins/video-toggle/back.ts b/plugins/video-toggle/back.ts index 944900e8..1fe17d6c 100644 --- a/plugins/video-toggle/back.ts +++ b/plugins/video-toggle/back.ts @@ -3,6 +3,7 @@ import path from 'node:path'; import { BrowserWindow } from 'electron'; import { injectCSS } from '../utils'; + import type { ConfigType } from '../../config/dynamic'; export default (win: BrowserWindow, options: ConfigType<'video-toggle'>) => { diff --git a/plugins/video-toggle/front.ts b/plugins/video-toggle/front.ts index bac2d9da..d6751dc2 100644 --- a/plugins/video-toggle/front.ts +++ b/plugins/video-toggle/front.ts @@ -2,10 +2,12 @@ import { ElementFromFile, templatePath } from '../utils'; import { setOptions, isEnabled } from '../../config/plugins'; import { moveVolumeHud as preciseVolumeMoveVolumeHud } from '../precise-volume/front'; -import type { ConfigType } from '../../config/dynamic'; + import { YoutubePlayer } from '../../types/youtube-player'; import { ThumbnailElement } from '../../types/get-player-response'; +import type { ConfigType } from '../../config/dynamic'; + const moveVolumeHud = isEnabled('precise-volume') ? preciseVolumeMoveVolumeHud : () => {}; function $(selector: string): HTMLElement | null { diff --git a/plugins/video-toggle/menu.ts b/plugins/video-toggle/menu.ts index 8afac05e..2013d58f 100644 --- a/plugins/video-toggle/menu.ts +++ b/plugins/video-toggle/menu.ts @@ -1,9 +1,11 @@ import { BrowserWindow } from 'electron'; import { setMenuOptions } from '../../config/plugins'; -import type { ConfigType } from '../../config/dynamic'; + import { MenuTemplate } from '../../menu'; +import type { ConfigType } from '../../config/dynamic'; + export default (win: BrowserWindow, options: ConfigType<'video-toggle'>): MenuTemplate => [ { label: 'Mode', diff --git a/plugins/visualizer/front.ts b/plugins/visualizer/front.ts index 591fcef8..9de40808 100644 --- a/plugins/visualizer/front.ts +++ b/plugins/visualizer/front.ts @@ -3,9 +3,10 @@ import { Visualizer } from './visualizers/visualizer'; import vudio from './visualizers/vudio'; import wave from './visualizers/wave'; -import type { ConfigType } from '../../config/dynamic'; import defaultConfig from '../../config/defaults'; +import type { ConfigType } from '../../config/dynamic'; + export default (options: ConfigType<'visualizer'>) => { const optionsWithDefaults = { ...defaultConfig.plugins.visualizer,