Revert "feat: google analytics (#15451)"

This reverts commit 2b6638e1

packages/frontend/src/analytics.ts

@@ -1,107 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import * as Misskey from 'misskey-js';
-import type { AnalyticsInstance, AnalyticsPlugin } from 'analytics';
-
-/**
- * analytics moduleを読み込まなくても動作するようにするためのラッパー
- */
-class AnalyticsProxy implements AnalyticsInstance {
-	private analytics?: AnalyticsInstance;
-
-	constructor(analytics?: AnalyticsInstance) {
-		if (analytics) {
-			this.analytics = analytics;
-		}
-	}
-
-	public setAnalytics(analytics: AnalyticsInstance) {
-		if (this.analytics) {
-			throw new Error('Analytics instance already exists.');
-		}
-		this.analytics = analytics;
-	}
-
-	public identify(...args: Parameters<AnalyticsInstance['identify']>) {
-		return this.analytics?.identify(...args) ?? Promise.resolve();
-	}
-
-	public track(...args: Parameters<AnalyticsInstance['track']>) {
-		return this.analytics?.track(...args) ?? Promise.resolve();
-	}
-
-	public page(...args: Parameters<AnalyticsInstance['page']>) {
-		return this.analytics?.page(...args) ?? Promise.resolve();
-	}
-
-	public user(...args: Parameters<AnalyticsInstance['user']>) {
-		return this.analytics?.user(...args) ?? Promise.resolve();
-	}
-
-	public reset(...args: Parameters<AnalyticsInstance['reset']>) {
-		return this.analytics?.reset(...args) ?? Promise.resolve();
-	}
-
-	public ready(...args: Parameters<AnalyticsInstance['ready']>) {
-		return this.analytics?.ready(...args) ?? function () { void 0; };
-	}
-
-	public on(...args: Parameters<AnalyticsInstance['on']>) {
-		return this.analytics?.on(...args) ?? function () { void 0; };
-	}
-
-	public once(...args: Parameters<AnalyticsInstance['once']>) {
-		return this.analytics?.once(...args) ?? function () { void 0; };
-	}
-
-	public getState(...args: Parameters<AnalyticsInstance['getState']>) {
-		return this.analytics?.getState(...args) ?? Promise.resolve();
-	}
-
-	public get storage() {
-		return this.analytics?.storage ?? {
-			getItem: () => null,
-			setItem: () => void 0,
-			removeItem: () => void 0,
-		};
-	}
-
-	public get plugins() {
-		return this.analytics?.plugins ?? {
-			enable: (p, c) => Promise.resolve(c ? c() : void 0),
-			disable: (p, c) => Promise.resolve(c ? c() : void 0),
-		};
-	}
-}
-
-export const analytics = new AnalyticsProxy();
-
-export async function initAnalytics(instance: Misskey.entities.MetaDetailed) {
-	// アナリティクスプロバイダに関する設定がひとつもない場合は、アナリティクスモジュールを読み込まない
-	if (!instance.googleAnalyticsMeasurementId) {
-		return;
-	}
-
-	const { default: Analytics } = await import('analytics');
-	const plugins: AnalyticsPlugin[] = [];
-
-	// Google Analytics
-	if (instance.googleAnalyticsMeasurementId) {
-		const { default: googleAnalytics } = await import('@analytics/google-analytics');
-
-		plugins.push(googleAnalytics({
-			measurementIds: [instance.googleAnalyticsMeasurementId],
-			debug: _DEV_,
-		}));
-	}
-
-	analytics.setAnalytics(Analytics({
-		app: 'misskey',
-		version: _VERSION_,
-		debug: _DEV_,
-		plugins,
-	}));
-}

packages/frontend/src/boot/common.ts

@@ -4,6 +4,7 @@
  */
 
 import { computed, watch, version as vueVersion } from 'vue';
+import type { App } from 'vue';
 import { compareVersions } from 'compare-versions';
 import { version, lang, langsVersion, updateLocale, locale } from '@@/js/config.js';
 import defaultLightTheme from '@@/themes/l-light.json5';
@@ -23,7 +24,6 @@ import { reloadChannel } from '@/utility/unison-reload.js';
 import { getUrlWithoutLoginId } from '@/utility/login-id.js';
 import { getAccountFromId } from '@/utility/get-account-from-id.js';
 import { deckStore } from '@/ui/deck/deck-store.js';
-import { analytics, initAnalytics } from '@/analytics.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { prefer } from '@/preferences.js';
@@ -255,19 +255,6 @@ export async function common(createVue: () => App<Element>) {
 		await fetchCustomEmojis();
 	} catch (err) { /* empty */ }
 
-	// analytics
-	fetchInstanceMetaPromise.then(async () => {
-		await initAnalytics(instance);
-
-		if ($i) {
-			analytics.identify($i.id);
-		}
-
-		analytics.page({
-			path: window.location.pathname,
-		});
-	});
-
 	const app = createVue();
 
 	if (_DEV_) {

packages/frontend/src/components/MkPageWindow.vue

@@ -43,7 +43,6 @@ import { provideMetadataReceiver, provideReactiveMetadata } from '@/page.js';
 import { openingWindowsCount } from '@/os.js';
 import { claimAchievement } from '@/utility/achievements.js';
 import { createRouter, mainRouter } from '@/router.js';
-import { analytics } from '@/analytics.js';
 import { DI } from '@/di.js';
 import { prefer } from '@/preferences.js';
 
@@ -109,10 +108,6 @@ windowRouter.addListener('replace', ctx => {
 windowRouter.addListener('change', ctx => {
 	if (_DEV_) console.log('windowRouter: change', ctx.fullPath);
 	searchMarkerId.value = getSearchMarker(ctx.fullPath);
-	analytics.page({
-		path: ctx.fullPath,
-		title: ctx.fullPath,
-	});
 });
 
 windowRouter.init();
@@ -176,11 +171,6 @@ function popout() {
 }
 
 onMounted(() => {
-	analytics.page({
-		path: props.initialPath,
-		title: props.initialPath,
-	});
-
 	openingWindowsCount.value++;
 	if (openingWindowsCount.value >= 3) {
 		claimAchievement('open3windows');

packages/frontend/src/pages/admin/external-services.vue

@@ -9,18 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
 			<div class="_gaps_m">
-				<MkFolder>
-					<template #label>Google Analytics<span class="_beta">{{ i18n.ts.beta }}</span></template>
-
-					<div class="_gaps_m">
-						<MkInput v-model="googleAnalyticsMeasurementId">
-							<template #prefix><i class="ti ti-key"></i></template>
-							<template #label>Measurement ID</template>
-						</MkInput>
-						<MkButton primary @click="save_googleAnalytics">Save</MkButton>
-					</div>
-				</MkFolder>
-
 				<MkFolder>
 					<template #label>DeepL Translation</template>
 
@@ -90,17 +78,14 @@ const deeplFreeInstance = ref<string | null>('');
 const libreTranslateURL = ref<string | null>('');
 const libreTranslateKey = ref<string | null>('');
 
-const googleAnalyticsMeasurementId = ref<string>('');
-
 async function init() {
 	const meta = await misskeyApi('admin/meta');
-	deeplAuthKey.value = meta.deeplAuthKey ?? '';
+	deeplAuthKey.value = meta.deeplAuthKey;
 	deeplIsPro.value = meta.deeplIsPro;
 	deeplFreeMode.value = meta.deeplFreeMode;
 	deeplFreeInstance.value = meta.deeplFreeInstance;
 	libreTranslateURL.value = meta.libreTranslateURL;
 	libreTranslateKey.value = meta.libreTranslateKey;
-	googleAnalyticsMeasurementId.value = meta.googleAnalyticsMeasurementId ?? '';
 }
 
 function save_deepl() {
@@ -123,14 +108,6 @@ function save_libre() {
 	});
 }
 
-function save_googleAnalytics() {
-	os.apiWithDialog('admin/update-meta', {
-		googleAnalyticsMeasurementId: googleAnalyticsMeasurementId.value,
-	}).then(() => {
-		fetchInstance(true);
-	});
-}
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);

packages/frontend/src/router.ts

@@ -8,7 +8,6 @@ import { page } from '@/router.definition.js';
 import { $i } from '@/i.js';
 import { Nirax } from '@/lib/nirax.js';
 import { ROUTE_DEF } from '@/router.definition.js';
-import { analytics } from '@/analytics.js';
 import { DI } from '@/di.js';
 
 export type Router = Nirax<typeof ROUTE_DEF>;
@@ -31,14 +30,6 @@ mainRouter.addListener('replace', ctx => {
 	window.history.replaceState({ }, '', ctx.fullPath);
 });
 
-mainRouter.addListener('change', ctx => {
-	if (_DEV_) console.log('mainRouter: change', ctx.fullPath);
-	analytics.page({
-		path: ctx.fullPath,
-		title: ctx.fullPath,
-	});
-});
-
 mainRouter.init();
 
 export function useRouter(): Router {