diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue index e6278e9576..8cf4e5fa2d 100644 --- a/packages/frontend/src/components/MkDateSeparatedList.vue +++ b/packages/frontend/src/components/MkDateSeparatedList.vue @@ -110,7 +110,7 @@ export default defineComponent({ }); const renderChildren = () => { - const shouldHideAds = prefer.s.hideAds && $i != null && $i.policies.canHideAds; + const shouldHideAds = (!prefer.s.forceShowAds && $i && $i.policies.canHideAds) ?? false; const children = renderChildrenImpl(shouldHideAds); if (isDebuggerEnabled(6864)) { diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index 5dc729856e..525c47da45 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -107,7 +107,7 @@ const chosen = ref(choseAd()); const self = computed(() => chosen.value?.url.startsWith(local)); -const shouldHide = computed(() => prefer.s.hideAds && $i != null && $i.policies.canHideAds && (props.specify == null)); +const shouldHide = ref(!prefer.s.forceShowAds && $i && $i.policies.canHideAds && (props.specify == null)); function reduceFrequency(): void { if (chosen.value == null) return; diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index 345dfa8e29..7220dc414e 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -913,8 +913,8 @@ SPDX-License-Identifier: AGPL-3.0-only - - + + @@ -1096,7 +1096,9 @@ const trustedDomains = prefer.model( (domainsList) => domainsList.join('\n'), (domainsString) => domainsString.split('\n').map( d => d.trim() ).filter( x => x.length > 0), ); -const hideAds = prefer.model('hideAds'); + +// Inverted to map between "hide ads" and "force show ads" +const hideAds = prefer.model('forceShowAds', x => !x, x => !x); watch([ hemisphere, diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index 31cfb71d1f..b651bdd31b 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -480,9 +480,6 @@ export const PREF_DEF = { warnMissingAltText: { default: true, }, - hideAds: { - default: false, - }, //#endregion //#region hybrid options