From 8a0bee6198290741408d147f70c39a6a8f75f7ab Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 8 Sep 2019 21:19:28 +0900
Subject: [PATCH] =?UTF-8?q?=E5=BA=83=E5=91=8A=E3=83=96=E3=83=AD=E3=83=83?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AE=E8=AD=A6=E5=91=8A=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=20(#5408)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove f*ckadbloack

* follow-buttonが消されないように

* revert version

* remove locales
---
 locales/ja-JP.yml                              |  3 ---
 package.json                                   |  1 -
 src/client/app/common/scripts/fuck-ad-block.ts | 18 ------------------
 .../app/common/views/components/user-list.vue  |  4 ++--
 src/client/app/desktop/script.ts               |  8 --------
 .../desktop/views/components/user-preview.vue  |  4 ++--
 yarn.lock                                      |  5 -----
 7 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 src/client/app/common/scripts/fuck-ad-block.ts

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b139b3829..141aefd5a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -19,9 +19,6 @@ common:
     drive: "ドライブ"
     drive-desc: "以前投稿したことのある画像をまた投稿したくなったことはありませんか？もしくは、アップロードしたファイルをフォルダ分けして整理したくなったことはありませんか？Misskeyの根幹に組み込まれたドライブ機能によってそれらが解決します。ファイルの共有も簡単です。"
     outro: "他にもMisskeyにしかない機能はまだまだあるので、ぜひあなた自身の目で確かめてください。Misskeyは分散型SNSなので、このインスタンスが気に入らなければ他のインスタンスを試すこともできます。それでは、GLHF!"
-  adblock:
-    detected: "広告ブロッカーを無効にしてください"
-    warning: "<strong>Misskeyは広告を掲載していません</strong>が、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。"
   application-authorization: "アプリの連携"
   close: "閉じる"
   do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。"
diff --git a/package.json b/package.json
index 963a6ee9a..c8e65b8b4 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,6 @@
 		"feed": "3.0.0",
 		"file-type": "12.2.0",
 		"fluent-ffmpeg": "2.1.2",
-		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
 		"gulp-imagemin": "6.1.0",
diff --git a/src/client/app/common/scripts/fuck-ad-block.ts b/src/client/app/common/scripts/fuck-ad-block.ts
deleted file mode 100644
index ba7e5a9f8..000000000
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-declare const fuckAdBlock: any;
-
-export default ($root: any) => {
-	require('fuckadblock');
-
-	function adBlockDetected() {
-		$root.dialog({
-			title: $root.$t('@.adblock.detected'),
-			text: $root.$t('@.adblock.warning')
-		});
-	}
-
-	if (fuckAdBlock === undefined) {
-		adBlockDetected();
-	} else {
-		fuckAdBlock.onDetected(adBlockDetected);
-	}
-};
diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
index 69cb65b44..9cf697133 100644
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -18,7 +18,7 @@
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
 				</div>
-				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
+				<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
 		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
@@ -134,7 +134,7 @@ export default Vue.extend({
 				font-size 14px
 				padding-right 40px
 
-			> .follow-button
+			> .koudoku-button
 				position absolute
 				top 8px
 				right 0
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 15365e9d5..914e162c9 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -9,7 +9,6 @@ import VueRouter from 'vue-router';
 import './style.styl';
 
 import init from '../init';
-import fuckAdBlock from '../common/scripts/fuck-ad-block';
 import composeNotification from '../common/scripts/compose-notification';
 
 import MkHome from './views/home/home.vue';
@@ -203,13 +202,6 @@ init(async (launch, os) => {
 	// Launch the app
 	const [app, _] = launch(router);
 
-	if (os.store.getters.isSignedIn) {
-		/**
-		 * Fuck AD Block
-		 */
-		fuckAdBlock(app);
-	}
-
 	/**
 	 * Init Notification
 	 */
diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue
index 9d9021c18..9328648cc 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -21,7 +21,7 @@
 				<p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span>
 			</div>
 		</div>
-		<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
+		<mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/>
 	</template>
 </div>
 </template>
@@ -156,7 +156,7 @@ export default Vue.extend({
 				font-size 1em
 				color var(--primary)
 
-	> .follow-button
+	> .koudoku-button
 		position absolute
 		top 8px
 		right 8px
diff --git a/yarn.lock b/yarn.lock
index d8716d707..1b20c5812 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4554,11 +4554,6 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fuckadblock@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/fuckadblock/-/fuckadblock-3.2.1.tgz#17fa3237a5e15c86613406b911e608191a3e62e2"
-  integrity sha1-F/oyN6XhXIZhNAa5EeYIGRo+YuI=
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"