summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-04-10 10:22:25 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-04-10 10:22:25 +0900
commit29c9a7d71a6d4af4f8d7d6a1c31a3734ca234180 (patch)
treeca3675da45348f422becdfe157c6e117523c5c9f
parentUpdate CHANGELOG.md (diff)
downloadmisskey-29c9a7d71a6d4af4f8d7d6a1c31a3734ca234180.tar.gz
misskey-29c9a7d71a6d4af4f8d7d6a1c31a3734ca234180.tar.bz2
misskey-29c9a7d71a6d4af4f8d7d6a1c31a3734ca234180.zip
enhance(frontend): 常に広告を見られるオプションを追加
-rw-r--r--CHANGELOG.md1
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--packages/frontend/src/components/global/MkAd.vue2
-rw-r--r--packages/frontend/src/pages/settings/general.vue2
-rw-r--r--packages/frontend/src/store.ts4
5 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 832130a79f..683ee3db87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
-
### Client
+- 常に広告を見られるオプションを追加
- ユーザーページの画像一覧が表示されない問題を修正
### Server
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 32bf47c209..b01699cab4 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -991,6 +991,7 @@ largeNoteReactions: "ノートのリアクションを大きく表示"
noteIdOrUrl: "ノートIDまたはURL"
accountMigration: "アカウントの引っ越し"
accountMoved: "このユーザーは新しいアカウントに引っ越しました:"
+forceShowAds: "常に広告を表示する"
_accountMigration:
moveTo: "このアカウントを新しいアカウントに引っ越す"
diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue
index 5799f99d5f..aa975600f0 100644
--- a/packages/frontend/src/components/global/MkAd.vue
+++ b/packages/frontend/src/components/global/MkAd.vue
@@ -83,7 +83,7 @@ const choseAd = (): Ad | null => {
};
const chosen = ref(choseAd());
-const shouldHide = $ref($i && $i.policies.canHideAds && (props.specify == null));
+const shouldHide = $ref(!defaultStore.state.forceShowAds && $i && $i.policies.canHideAds && (props.specify == null));
function reduceFrequency(): void {
if (chosen.value == null) return;
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index f88e934e1d..904fd3f952 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -61,6 +61,7 @@
<MkSwitch v-model="squareAvatars">{{ i18n.ts.squareAvatars }}</MkSwitch>
<MkSwitch v-model="useSystemFont">{{ i18n.ts.useSystemFont }}</MkSwitch>
<MkSwitch v-model="disableDrawer">{{ i18n.ts.disableDrawer }}</MkSwitch>
+ <MkSwitch v-model="forceShowAds">{{ i18n.ts.forceShowAds }}</MkSwitch>
</div>
<div>
<MkRadios v-model="emojiStyle">
@@ -157,6 +158,7 @@ const advancedMfm = computed(defaultStore.makeGetterSetter('advancedMfm'));
const emojiStyle = computed(defaultStore.makeGetterSetter('emojiStyle'));
const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('disableShowingAnimatedImages'));
+const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
const nsfw = computed(defaultStore.makeGetterSetter('nsfw'));
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index e5558829d4..0728fc84e5 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -298,6 +298,10 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'device',
default: false,
},
+ forceShowAds: {
+ where: 'device',
+ default: false,
+ },
aiChanMode: {
where: 'device',
default: false,