diff --git a/src/api/APIManager.ts b/src/api/APIManager.ts index bae09fa..56cee80 100644 --- a/src/api/APIManager.ts +++ b/src/api/APIManager.ts @@ -23,7 +23,7 @@ export class APIManager { let res: MediaTypeModel[] = []; for (const api of this.apis) { - if (apisToQuery.contains(api.apiName) && (this.plugin.settings[[api.apiName, mediaType].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "default"].filter(s => s).join('') as keyof typeof this.plugin.settings])) { + if (apisToQuery.contains(api.apiName) && !(this.plugin.settings[[api.apiName, mediaType].filter(s => s).join('') as keyof typeof this.plugin.settings] === false)) { const apiRes = await api.searchByTitle(query); res = res.concat(apiRes); } diff --git a/src/main.ts b/src/main.ts index 7b96a1e..b8b7711 100644 --- a/src/main.ts +++ b/src/main.ts @@ -156,7 +156,7 @@ export default class MediaDbPlugin extends Plugin { */ async createLinkWithSearchModal(): Promise { const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { - return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default"); + return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, ""); }); if (!apiSearchResults) { @@ -218,7 +218,7 @@ export default class MediaDbPlugin extends Plugin { async createEntryWithAdvancedSearchModal(): Promise { const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { - return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default"); + return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, ""); }); if (!apiSearchResults) { @@ -570,7 +570,7 @@ export default class MediaDbPlugin extends Plugin { let results: MediaTypeModel[] = []; try { - results = await this.apiManager.query(title, [selectedAPI], "default"); + results = await this.apiManager.query(title, [selectedAPI], ""); } catch (e) { erroredFiles.push({ filePath: file.path, error: e.toString() }); continue; diff --git a/src/modals/MediaDbAdvancedSearchModal.ts b/src/modals/MediaDbAdvancedSearchModal.ts index 605aec5..3093ac0 100644 --- a/src/modals/MediaDbAdvancedSearchModal.ts +++ b/src/modals/MediaDbAdvancedSearchModal.ts @@ -87,8 +87,7 @@ export class MediaDbAdvancedSearchModal extends Modal { // const apiToggleComponents: Component[] = []; for (const api of this.plugin.apiManager.apis) { - if (this.plugin.settings[[api.apiName, "default"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "game"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "series"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "movie"].filter(s => s).join('') as keyof typeof this.plugin.settings]) { - const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); + const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' }); @@ -104,7 +103,6 @@ export class MediaDbAdvancedSearchModal extends Modal { }); apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); } - } contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index 9a517ba..76b7e63 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -26,11 +26,6 @@ export interface MediaDbPluginSettings { MALAPIseries: boolean; SteamAPIgame: boolean; MobyGamesAPIgame: boolean; - BoardGameGeekAPIdefault: boolean; - MALAPIMangadefault: boolean; - MusicBrainzAPIdefault: boolean; - OpenLibraryAPIdefault: boolean; - WikipediaAPIdefault: boolean; movieTemplate: string; seriesTemplate: string; @@ -88,11 +83,6 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = { MALAPImovie: true, SteamAPIgame: true, MobyGamesAPIgame: true, - BoardGameGeekAPIdefault: true, - MALAPIMangadefault: true, - MusicBrainzAPIdefault: true, - OpenLibraryAPIdefault: true, - WikipediaAPIdefault: true, movieTemplate: '', seriesTemplate: '',