From 9b316c3ee72571401942d1aa13c27d05b568bd27 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 13 Jul 2022 17:54:12 -0700
Subject: [PATCH 1/6] Make showing ads toggleable

---
 locales/ja-JP.yml                                    |  1 +
 packages/backend/migration/1657759324648-show-ads.js | 11 +++++++++++
 packages/client/src/components/global/ad.vue         |  6 ++++--
 packages/client/src/pages/settings/general.vue       |  3 +++
 packages/client/src/store.ts                         |  4 ++++
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 packages/backend/migration/1657759324648-show-ads.js

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0e278bead..9c17bf6d1 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -887,6 +887,7 @@ beta: "ベータ"
 enableAutoSensitive: "自動NSFW判定"
 enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、インスタンスによっては自動で設定されることがあります。"
 activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。"
+showAds: "広告を表示する"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
diff --git a/packages/backend/migration/1657759324648-show-ads.js b/packages/backend/migration/1657759324648-show-ads.js
new file mode 100644
index 000000000..2e00dfd68
--- /dev/null
+++ b/packages/backend/migration/1657759324648-show-ads.js
@@ -0,0 +1,11 @@
+export class showAds1657759324648 {
+	name = 'showAds1657759324648'
+
+    async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "user_profile" ADD "showAds" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP "showAds"`);
+    }
+}
diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/ad.vue
index 180dabb2a..e1941a832 100644
--- a/packages/client/src/components/global/ad.vue
+++ b/packages/client/src/components/global/ad.vue
@@ -1,6 +1,6 @@
 <template>
-<div v-if="ad" class="qiivuoyo">
-	<div v-if="!showMenu" class="main" :class="ad.place">
+<div v-if="adz" class="qiivuoyo">
+	<div v-if="!showMenu && showAds" class="main" :class="ad.place">
 		<a :href="ad.url" target="_blank">
 			<img :src="ad.imageUrl">
 			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle"></span></button>
@@ -44,6 +44,7 @@ export default defineComponent({
 
 	setup(props) {
 		const showMenu = ref(false);
+		const showAds = ref<boolean>(defaultStore.state.showAds);
 		const toggleMenu = () => {
 			showMenu.value = !showMenu.value;
 		};
@@ -104,6 +105,7 @@ export default defineComponent({
 		return {
 			ad: chosen,
 			showMenu,
+			showAds,
 			toggleMenu,
 			host,
 			reduceFrequency,
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 74fa0bc92..8685266d3 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -39,6 +39,7 @@
 
 	<FormSection>
 		<template #label>{{ i18n.ts.appearance }}</template>
+		<FormSwitch v-model="showAds" class="_formBlock">{{ i18n.ts.showAds }}</FormSwitch>
 		<FormSwitch v-model="disableAnimatedMfm" class="_formBlock">{{ i18n.ts.disableAnimatedMfm }}</FormSwitch>
 		<FormSwitch v-model="reduceAnimation" class="_formBlock">{{ i18n.ts.reduceUiAnimation }}</FormSwitch>
 		<FormSwitch v-model="useBlurEffect" class="_formBlock">{{ i18n.ts.useBlurEffect }}</FormSwitch>
@@ -128,6 +129,7 @@ const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v =>
 const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal'));
 const useBlurEffect = computed(defaultStore.makeGetterSetter('useBlurEffect'));
 const showGapBetweenNotesInTimeline = computed(defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'));
+const showAds = computed(defaultStore.makeGetterSetter('showAds'));
 const disableAnimatedMfm = computed(defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v));
 const useOsNativeEmojis = computed(defaultStore.makeGetterSetter('useOsNativeEmojis'));
 const disableDrawer = computed(defaultStore.makeGetterSetter('disableDrawer'));
@@ -175,6 +177,7 @@ watch([
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
 	overridedDeviceKind,
+	showAds,
 ], async () => {
 	await reloadAsk();
 });
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 503333331..416eb849d 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -63,6 +63,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: [] as string[],
 	},
+	showAds: {
+		where: 'account',
+		default: true,
+	},
 
 	menu: {
 		where: 'deviceAccount',

From 6f2036565b5d1dc736cd6beb52a4847b0b7dd984 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 13 Jul 2022 18:19:01 -0700
Subject: [PATCH 2/6] fix

---
 packages/client/src/components/global/ad.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/ad.vue
index e1941a832..aba2087f1 100644
--- a/packages/client/src/components/global/ad.vue
+++ b/packages/client/src/components/global/ad.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 
 	setup(props) {
 		const showMenu = ref(false);
-		const showAds = ref<boolean>(defaultStore.state.showAds);
+		const showAds = defaultStore.state.showAds;
 		const toggleMenu = () => {
 			showMenu.value = !showMenu.value;
 		};

From 4684d279ae2892409d0838ba264a52627d3946f8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 13 Jul 2022 18:19:18 -0700
Subject: [PATCH 3/6] typo

---
 packages/client/src/components/global/ad.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/ad.vue
index aba2087f1..5225455ba 100644
--- a/packages/client/src/components/global/ad.vue
+++ b/packages/client/src/components/global/ad.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-if="adz" class="qiivuoyo">
+<div v-if="ad" class="qiivuoyo">
 	<div v-if="!showMenu && showAds" class="main" :class="ad.place">
 		<a :href="ad.url" target="_blank">
 			<img :src="ad.imageUrl">

From 38e0ff98755d21ba4dc68be24cda38db5aa37792 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 13 Jul 2022 18:28:11 -0700
Subject: [PATCH 4/6] fix

---
 packages/client/src/components/global/ad.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/ad.vue
index 5225455ba..cf59c4f4e 100644
--- a/packages/client/src/components/global/ad.vue
+++ b/packages/client/src/components/global/ad.vue
@@ -1,6 +1,6 @@
 <template>
-<div v-if="ad" class="qiivuoyo">
-	<div v-if="!showMenu && showAds" class="main" :class="ad.place">
+<div v-if="ad && showAds" class="qiivuoyo">
+	<div v-if="!showMenu" class="main" :class="ad.place">
 		<a :href="ad.url" target="_blank">
 			<img :src="ad.imageUrl">
 			<button class="_button menu" @click.prevent.stop="toggleMenu"><span class="fas fa-info-circle"></span></button>

From d16afd3d13f1e8e7c7d20c781e03bdf584200a8c Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 13 Jul 2022 23:54:22 -0700
Subject: [PATCH 5/6] spacing

---
 packages/backend/migration/1657759324648-show-ads.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend/migration/1657759324648-show-ads.js b/packages/backend/migration/1657759324648-show-ads.js
index 2e00dfd68..bbe794e7b 100644
--- a/packages/backend/migration/1657759324648-show-ads.js
+++ b/packages/backend/migration/1657759324648-show-ads.js
@@ -1,11 +1,11 @@
 export class showAds1657759324648 {
 	name = 'showAds1657759324648'
 
-    async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_profile" ADD "showAds" boolean NOT NULL DEFAULT false`);
-    }
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_profile" ADD "showAds" boolean NOT NULL DEFAULT false`);
+	}
 
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP "showAds"`);
-    }
+	async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "user_profile" DROP "showAds"`);
+	}
 }

From 32115b5ca54cc21518625eea67c2460cbf5d7ccf Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com>
Date: Thu, 14 Jul 2022 17:41:10 -0700
Subject: [PATCH 6/6] Delete 1657759324648-show-ads.js

---
 packages/backend/migration/1657759324648-show-ads.js | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 packages/backend/migration/1657759324648-show-ads.js

diff --git a/packages/backend/migration/1657759324648-show-ads.js b/packages/backend/migration/1657759324648-show-ads.js
deleted file mode 100644
index bbe794e7b..000000000
--- a/packages/backend/migration/1657759324648-show-ads.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export class showAds1657759324648 {
-	name = 'showAds1657759324648'
-
-	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "user_profile" ADD "showAds" boolean NOT NULL DEFAULT false`);
-	}
-
-	async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_profile" DROP "showAds"`);
-	}
-}