diff --git a/.config/docker_example.yml b/.config/docker_example.yml index d80516ce2c..9e9c050e19 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -195,4 +195,4 @@ signToActivityPubGet: true #maxFileSize: 262144000 # Value of Content-Security-Policy header -#contentSecurityPolicy: "script-src 'self' 'unsafe-eval' https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/; base-uri 'self'; object-src 'self';" +#contentSecurityPolicy: "script-src 'self' 'unsafe-eval' https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/ https://www.googletagmanager.com/; base-uri 'self'; object-src 'self';" diff --git a/.config/example.yml b/.config/example.yml index 7612c063e6..6c1a151618 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -118,7 +118,7 @@ redis: # ┌───────────────────────────┐ #───┘ MeiliSearch configuration └───────────────────────────── -# You can set scope to local (default value) or global +# You can set scope to local (default value) or global # (include notes from remote). #meilisearch: @@ -214,7 +214,7 @@ proxyRemoteFiles: true signToActivityPubGet: true # For security reasons, uploading attachments from the intranet is prohibited, -# but exceptions can be made from the following settings. Default value is "undefined". +# but exceptions can be made from the following settings. Default value is "undefined". # Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)). #allowedPrivateNetworks: [ # '127.0.0.1/32' @@ -227,4 +227,4 @@ signToActivityPubGet: true #pidFile: /tmp/misskey.pid # Value of Content-Security-Policy header -#contentSecurityPolicy: "script-src 'self' 'unsafe-eval' https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/; base-uri 'self'; object-src 'self';" +#contentSecurityPolicy: "script-src 'self' 'unsafe-eval' https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/ https://www.googletagmanager.com/; base-uri 'self'; object-src 'self';" diff --git a/locales/en-US.yml b/locales/en-US.yml index 5e25dee5d8..bd8e60e6a9 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1273,6 +1273,20 @@ here: "here" mutualLink: "Mutual Link" saveThisFile: "Save this file to Drive" changeUserName: "Change name" +gtagConsentCustomize: "Data Collection and Privacy Settings" +gtagConsentCustomizeDescription: "You can customize the scope of data collected by {host}.\nHowever, you cannot disable the collection of security-related information such as authentication features, fraud prevention, and other user protections." +gtagConsentAnalytics: "Collection of Statistical Information" +gtagConsentAnalyticsDescription: "Enable the storage (cookies, etc.) of analytics-related information such as site visit duration." +gtagConsentFunctionality: "Collection of Feature and Setting Usage" +gtagConsentFunctionalityDescription: "Enable the storage of information that supports website or app features, such as language settings." +gtagConsentPersonalization: "Collection of Personalized Information" +gtagConsentPersonalizationDescription: "Enable the storage of personalization-related information such as recommended posts." +helpUsImproveUserExperience: "To build the future of Misskey,\nplease help us by agreeing to data collection!" +pleaseConsentToTracking: "{host} may collect information that may include personal data such as your IP address, usage data, and device information during your use, based on our [Privacy Policy]({privacyPolicyUrl}), for the purpose of providing and operating the service and improving the user experience.\n\nThe collected data will be used for future feature development, operational policy decisions, and identifying areas for service improvement." +consentEssential: "Allow Essential Items" +consentAll: "Allow All Items" +consentSelected: "Allow Selected Items" + _bubbleGame: howToPlay: "How to play" hold: "Hold" diff --git a/locales/index.d.ts b/locales/index.d.ts index 482457d78b..3c2838b777 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5150,6 +5150,62 @@ export interface Locale extends ILocale { * 名前を変更 */ "changeUserName": string; + /** + * データ収集とプライバシー設定 + */ + "gtagConsentCustomize": string; + /** + * {host}が収集するデータの範囲をカスタマイズできます。 + * ただし、認証機能、不正行為防止、その他のユーザー保護など、セキュリティに関連する情報の収集は無効化できません。 + */ + "gtagConsentCustomizeDescription": ParameterizedString<"host">; + /** + * 統計情報の収集 + */ + "gtagConsentAnalytics": string; + /** + * サイトの滞在時間など、分析に関連する情報の保存（Cookie など）を有効にします。 + */ + "gtagConsentAnalyticsDescription": string; + /** + * 機能・設定の利用状況の収集 + */ + "gtagConsentFunctionality": string; + /** + * 言語設定など、ウェブサイトやアプリの機能をサポートする情報の保存を有効にします。 + */ + "gtagConsentFunctionalityDescription": string; + /** + * パーソナライズされた情報の収集 + */ + "gtagConsentPersonalization": string; + /** + * おすすめの投稿など、パーソナライズに関連する情報の保存を有効にします。 + */ + "gtagConsentPersonalizationDescription": string; + /** + * Misskeyの明日を作るために、 + * データ収集にご協力ください！ + */ + "helpUsImproveUserExperience": string; + /** + * {host}は[プライバシーポリシー]({privacyPolicyUrl})に基づき、サービスの提供・運営・ユーザー体験の向上のためにご利用中のIPアドレス、利用状況、デバイス情報等、個人情報を含む可能性のある情報を収集することがあります。 + * + * 収集されたデータは今後の機能の開発、運営の方針の決定、サービスの改善点の特定に利用されます。 + */ + "pleaseConsentToTracking": ParameterizedString<"host" | "privacyPolicyUrl">; + /** + * 必須項目のみ許可 + */ + "consentEssential": string; + /** + * 全て許可 + */ + "consentAll": string; + /** + * 選択した項目のみ許可 + */ + "consentSelected": string; "_bubbleGame": { /** * 遊び方 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 1693d9c7b1..9e0663d58e 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1282,6 +1282,19 @@ here: "こちら" mutualLink: "相互リンク" saveThisFile: "このファイルをドライブに保存する" changeUserName: "名前を変更" +gtagConsentCustomize: "データ収集とプライバシー設定" +gtagConsentCustomizeDescription: "{host}が収集するデータの範囲をカスタマイズできます。\nただし、認証機能、不正行為防止、その他のユーザー保護など、セキュリティに関連する情報の収集は無効化できません。" +gtagConsentAnalytics: "統計情報の収集" +gtagConsentAnalyticsDescription: "サイトの滞在時間など、分析に関連する情報の保存（Cookie など）を有効にします。" +gtagConsentFunctionality: "機能・設定の利用状況の収集" +gtagConsentFunctionalityDescription: "言語設定など、ウェブサイトやアプリの機能をサポートする情報の保存を有効にします。" +gtagConsentPersonalization: "パーソナライズされた情報の収集" +gtagConsentPersonalizationDescription: "おすすめの投稿など、パーソナライズに関連する情報の保存を有効にします。" +helpUsImproveUserExperience: "Misskeyの明日を作るために、\nデータ収集にご協力ください！" +pleaseConsentToTracking: "{host}は[プライバシーポリシー]({privacyPolicyUrl})に基づき、サービスの提供・運営・ユーザー体験の向上のためにご利用中のIPアドレス、利用状況、デバイス情報等、個人情報を含む可能性のある情報を収集することがあります。\n\n収集されたデータは今後の機能の開発、運営の方針の決定、サービスの改善点の特定に利用されます。" +consentEssential: "必須項目のみ許可" +consentAll: "全て許可" +consentSelected: "選択した項目のみ許可" _bubbleGame: howToPlay: "遊び方" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 0cdfb2d7ba..097c71a121 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1266,6 +1266,20 @@ here: "여기" mutualLink: "서로링크" saveThisFile: "이 파일을 드라이브에 저장" changeUserName: "이름 변경" +gtagConsentCustomize: "데이터 수집 및 개인정보 설정" +gtagConsentCustomizeDescription: "{host}에서 수집하는 데이터 범위를 사용자 지정할 수 있습니다.\n다만, 인증 기능, 부정 행위 방지, 기타 사용자 보호 등 보안과 관련된 정보 수집은 비활성화할 수 없습니다." +gtagConsentAnalytics: "통계 정보 수집" +gtagConsentAnalyticsDescription: "사이트 체류 시간 등 분석 관련 정보 저장(쿠키 등)을 활성화합니다." +gtagConsentFunctionality: "기능 및 설정 사용 정보 수집" +gtagConsentFunctionalityDescription: "언어 설정 등 웹사이트나 앱의 기능을 지원하는 정보 저장을 활성화합니다." +gtagConsentPersonalization: "개인 맞춤형 정보 수집" +gtagConsentPersonalizationDescription: "추천 게시물 등 개인화 관련 정보 저장을 활성화합니다." +helpUsImproveUserExperience: "Misskey의 미래를 위해,\n데이터 수집에 협조해 주세요!" +pleaseConsentToTracking: "{host}는 [개인정보 처리방침]({privacyPolicyUrl})에 따라 서비스 제공, 운영, 사용자 경험 향상을 위해 사용 중인 IP 주소, 이용 현황, 디바이스 정보 등 개인 정보를 포함할 수 있는 정보를 수집할 수 있습니다.\n\n수집된 데이터는 향후 기능 개발, 운영 방침 결정, 서비스 개선점 파악에 활용됩니다." +consentEssential: "필수 항목만 허용" +consentAll: "모두 허용" +consentSelected: "선택한 항목만 허용" + _bubbleGame: howToPlay: "설명" hold: "홀드" diff --git a/packages/backend/migration/1730629332694-GoogleAnalyticsId.js b/packages/backend/migration/1730629332694-GoogleAnalyticsId.js new file mode 100644 index 0000000000..0f8cbf87f4 --- /dev/null +++ b/packages/backend/migration/1730629332694-GoogleAnalyticsId.js @@ -0,0 +1,11 @@ +export class GoogleAnalyticsId1730629332694 { + name = 'GoogleAnalyticsId1730629332694' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "googleAnalyticsId" character varying(32)`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "googleAnalyticsId"`); + } +} diff --git a/packages/backend/src/NestLogger.ts b/packages/backend/src/NestLogger.ts index 80f1f7a024..8e03dcd7db 100644 --- a/packages/backend/src/NestLogger.ts +++ b/packages/backend/src/NestLogger.ts @@ -4,10 +4,9 @@ */ import { LoggerService } from '@nestjs/common'; -import Logger from '@/logger.js'; +import { coreLogger } from '@/logger.js'; -const logger = new Logger('core', 'cyan'); -const nestLogger = logger.createSubLogger('nest', 'green', false); +const nestLogger = coreLogger.createSubLogger('nest', 'green', false); export class NestLogger implements LoggerService { /** diff --git a/packages/backend/src/boot/entry.ts b/packages/backend/src/boot/entry.ts index 9acb89929c..dbfb538787 100644 --- a/packages/backend/src/boot/entry.ts +++ b/packages/backend/src/boot/entry.ts @@ -12,7 +12,7 @@ import { EventEmitter } from 'node:events'; import process from 'node:process'; import chalk from 'chalk'; import Xev from 'xev'; -import Logger from '@/logger.js'; +import { coreLogger } from '@/logger.js'; import { envOption } from '../env.js'; import { masterMain } from './master.js'; import { workerMain } from './worker.js'; @@ -24,8 +24,7 @@ process.title = `Misskey (${cluster.isPrimary ? 'master' : 'worker'})`; Error.stackTraceLimit = Infinity; EventEmitter.defaultMaxListeners = 128; -const logger = new Logger('core', 'cyan'); -const clusterLogger = logger.createSubLogger('cluster', 'orange', false); +const clusterLogger = coreLogger.createSubLogger('cluster', 'orange', false); const ev = new Xev(); //#region Events @@ -53,12 +52,12 @@ if (cluster.isPrimary && !envOption.disableClustering) { }); process.on('SIGINT', () => { - logger.warn(chalk.yellow('Process received SIGINT')); + coreLogger.warn(chalk.yellow('Process received SIGINT')); isShuttingDown = true; }); process.on('SIGTERM', () => { - logger.warn(chalk.yellow('Process received SIGTERM')); + coreLogger.warn(chalk.yellow('Process received SIGTERM')); isShuttingDown = true; }); } @@ -71,18 +70,18 @@ if (!envOption.quiet) { // Display detail of uncaught exception process.on('uncaughtException', err => { try { - logger.error(`Uncaught exception: ${err.message}`, { error: err }); + coreLogger.error(`Uncaught exception: ${err.message}`, { error: err }); } catch { } }); // Dying away... process.on('exit', code => { - logger.warn(chalk.yellow(`The process is going to exit with code ${code}`)); + coreLogger.warn(chalk.yellow(`The process is going to exit with code ${code}`)); }); process.on('warning', warning => { if ((warning as never)['code'] !== 'MISSKEY_SHUTDOWN') return; - logger.warn(chalk.yellow(`${warning.message}: ${(warning as never)['detail']}`)); + coreLogger.warn(chalk.yellow(`${warning.message}: ${(warning as never)['detail']}`)); for (const id in cluster.workers) cluster.workers[id]?.process.kill('SIGTERM'); process.exit(); }); diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index b442e1aa42..b14a8f4dc5 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -10,7 +10,7 @@ import * as os from 'node:os'; import cluster from 'node:cluster'; import chalk from 'chalk'; import chalkTemplate from 'chalk-template'; -import Logger from '@/logger.js'; +import { coreLogger } from '@/logger.js'; import { loadConfig } from '@/config.js'; import type { Config } from '@/config.js'; import { showMachineInfo } from '@/misc/show-machine-info.js'; @@ -22,8 +22,7 @@ const _dirname = dirname(_filename); const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8')); -const logger = new Logger('core', 'cyan'); -const bootLogger = logger.createSubLogger('boot', 'magenta', false); +const bootLogger = coreLogger.createSubLogger('boot', 'magenta', false); const themeColor = chalk.hex('#86b300'); diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index b15fbeaab8..08ea127dec 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -43,6 +43,7 @@ import { RoleService } from '@/core/RoleService.js'; import { correctFilename } from '@/misc/correct-filename.js'; import { isMimeImage } from '@/misc/is-mime-image.js'; import { ModerationLogService } from '@/core/ModerationLogService.js'; +import { LoggerService } from '@/core/LoggerService.js'; type AddFileArgs = { /** User who wish to add file */ @@ -123,12 +124,13 @@ export class DriveService { private globalEventService: GlobalEventService, private queueService: QueueService, private roleService: RoleService, + private loggerService: LoggerService, private moderationLogService: ModerationLogService, private driveChart: DriveChart, private perUserDriveChart: PerUserDriveChart, private instanceChart: InstanceChart, ) { - const logger = new Logger('drive', 'blue'); + const logger = this.loggerService.getLogger('drive', 'blue'); this.registerLogger = logger.createSubLogger('register', 'yellow'); this.downloaderLogger = logger.createSubLogger('downloader'); this.deleteLogger = logger.createSubLogger('delete'); diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts index ceca6a27d8..231e09af14 100644 --- a/packages/backend/src/core/FetchInstanceMetadataService.ts +++ b/packages/backend/src/core/FetchInstanceMetadataService.ts @@ -159,7 +159,7 @@ export class FetchInstanceMetadataService { throw err.statusCode ?? err.message; }); - this.logger.succ(`Successfuly fetched nodeinfo of ${instance.host}`); + this.logger.succ(`Successfully fetched nodeinfo of ${instance.host}`); return info as NodeInfo; } catch (err) { diff --git a/packages/backend/src/core/LoggerService.ts b/packages/backend/src/core/LoggerService.ts index a3d371a303..cd5d097e99 100644 --- a/packages/backend/src/core/LoggerService.ts +++ b/packages/backend/src/core/LoggerService.ts @@ -4,7 +4,7 @@ */ import { Injectable } from '@nestjs/common'; -import Logger from '@/logger.js'; +import { rootLogger } from '@/logger.js'; import { bindThis } from '@/decorators.js'; import type { KEYWORD } from 'color-convert/conversions.js'; @@ -16,6 +16,6 @@ export class LoggerService { @bindThis public getLogger(domain: string, color?: KEYWORD | undefined, store?: boolean) { - return new Logger(domain); + return rootLogger.createSubLogger(domain, color, store); } } diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 66acd6b224..20c7f3e2b7 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -257,7 +257,7 @@ export class NoteCreateService implements OnApplicationShutdown { const policies = await this.roleService.getUserPolicies(user.id); if (!policies.canCreateContent) { - this.logger.error('Request rejected because user has no permission to create content', { user: user.id, note: data }); + this.logger.error('Request rejected because user has no permission to create content', { userId: user.id, note: data }); throw new IdentifiableError('5b1c2b67-50a6-4a8a-a59c-0ede40890de3', 'User has no permission to create content.'); } @@ -265,7 +265,7 @@ export class NoteCreateService implements OnApplicationShutdown { const sensitiveWords = meta.sensitiveWords; if (this.utilityService.isKeyWordIncluded(data.cw ?? this.utilityService.concatNoteContentsForKeyWordCheck({ text: data.text, pollChoices: data.poll?.choices }), sensitiveWords)) { data.visibility = 'home'; - this.logger.warn('Visibility changed to home because sensitive words are included', { user: user.id, note: data }); + this.logger.warn('Visibility changed to home because sensitive words are included', { userId: user.id, note: data }); } else if (!policies.canPublicNote) { data.visibility = 'home'; } @@ -281,7 +281,7 @@ export class NoteCreateService implements OnApplicationShutdown { ); if (hasProhibitedWords) { - this.logger.error('Request rejected because prohibited words are included', { user: user.id, note: data }); + this.logger.error('Request rejected because prohibited words are included', { userId: user.id, note: data }); throw new IdentifiableError('689ee33f-f97c-479a-ac49-1b9f8140af99', 'Notes including prohibited words are not allowed.'); } @@ -384,7 +384,7 @@ export class NoteCreateService implements OnApplicationShutdown { if (process.env.MISSKEY_BLOCK_MENTIONS_FROM_UNFAMILIAR_REMOTE_USERS === 'true' && user.host !== null && willCauseNotification) { const userEntity = await this.usersRepository.findOneBy({ id: user.id }); if ((userEntity?.followersCount ?? 0) === 0) { - this.logger.error('Request rejected because user has no local followers', { user: user.id, note: data }); + this.logger.error('Request rejected because user has no local followers', { userId: user.id, note: data }); throw new IdentifiableError('e11b3a16-f543-4885-8eb1-66cad131dbfd', 'Notes including mentions, replies, or renotes from remote users are not allowed until user has at least one local follower.'); } } @@ -396,7 +396,7 @@ export class NoteCreateService implements OnApplicationShutdown { || (data.visibility === 'specified' && data.visibleUsers?.some(u => u.id !== user.id)) || (this.isQuote(data) && data.renote.userId !== user.id) ) { - this.logger.error('Request rejected because user has no permission to initiate conversation', { user: user.id, note: data }); + this.logger.error('Request rejected because user has no permission to initiate conversation', { userId: user.id, note: data }); throw new IdentifiableError('332dd91b-6a00-430a-ac39-620cf60ad34b', 'Notes including mentions, replies, or renotes are not allowed.'); } } diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 96f389b54c..9ab2c0271e 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/packages/backend/src/core/UserBlockingService.ts @@ -50,7 +50,7 @@ export class UserBlockingService implements OnModuleInit { private apRendererService: ApRendererService, private loggerService: LoggerService, ) { - this.logger = this.loggerService.getLogger('user-block'); + this.logger = this.loggerService.getLogger('user:block'); } onModuleInit() { diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index 5949c70a50..753eb3592e 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -30,9 +30,8 @@ import { AccountMoveService } from '@/core/AccountMoveService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { FanoutTimelineService } from '@/core/FanoutTimelineService.js'; import type { ThinUser } from '@/queue/types.js'; -import Logger from '../logger.js'; - -const logger = new Logger('following/create'); +import { LoggerService } from '@/core/LoggerService.js'; +import Logger from '@/logger.js'; type Local = MiLocalUser | { id: MiLocalUser['id']; @@ -50,6 +49,7 @@ type Both = Local | Remote; @Injectable() export class UserFollowingService implements OnModuleInit { private userBlockingService: UserBlockingService; + private readonly logger: Logger; constructor( private moduleRef: ModuleRef, @@ -73,6 +73,7 @@ export class UserFollowingService implements OnModuleInit { private instancesRepository: InstancesRepository, private cacheService: CacheService, + private loggerService: LoggerService, private utilityService: UtilityService, private userEntityService: UserEntityService, private idService: IdService, @@ -88,6 +89,7 @@ export class UserFollowingService implements OnModuleInit { private perUserFollowingChart: PerUserFollowingChart, private instanceChart: InstanceChart, ) { + this.logger = this.loggerService.getLogger('user:following'); } onModuleInit() { @@ -255,7 +257,7 @@ export class UserFollowingService implements OnModuleInit { followeeSharedInbox: this.userEntityService.isRemoteUser(followee) ? followee.sharedInbox : null, }).catch(err => { if (isDuplicateKeyValueError(err) && this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) { - logger.info(`Insert duplicated ignore. ${follower.id} => ${followee.id}`); + this.logger.info(`Insert duplicated ignore. ${follower.id} => ${followee.id}`); alreadyFollowed = true; } else { throw err; @@ -378,7 +380,7 @@ export class UserFollowingService implements OnModuleInit { }); if (following === null || !following.follower || !following.followee) { - logger.warn('フォロー解除がリクエストされましたがフォローしていませんでした'); + this.logger.warn('フォロー解除がリクエストされましたがフォローしていませんでした'); return; } diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index 93ac8ce9a7..b008a3ec59 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -145,8 +145,7 @@ export class ApRequestService { private httpRequestService: HttpRequestService, private loggerService: LoggerService, ) { - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - this.logger = this.loggerService?.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる + this.logger = this.loggerService.getLogger('ap:request'); } @bindThis diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts index bb3c40f093..fbe32ba180 100644 --- a/packages/backend/src/core/activitypub/ApResolverService.ts +++ b/packages/backend/src/core/activitypub/ApResolverService.ts @@ -45,7 +45,7 @@ export class Resolver { private recursionLimit = 100, ) { this.history = new Set(); - this.logger = this.loggerService.getLogger('ap-resolve'); + this.logger = this.loggerService.getLogger('ap:resolve'); } @bindThis diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts index 7fbde9008f..28780b8d41 100644 --- a/packages/backend/src/core/entities/MetaEntityService.ts +++ b/packages/backend/src/core/entities/MetaEntityService.ts @@ -77,6 +77,7 @@ export class MetaEntityService { recaptchaSiteKey: instance.recaptchaSiteKey, enableTurnstile: instance.enableTurnstile, turnstileSiteKey: instance.turnstileSiteKey, + googleAnalyticsId: instance.googleAnalyticsId, swPublickey: instance.swPublicKey, themeColor: instance.themeColor, mascotImageUrl: instance.mascotImageUrl ?? '/assets/ai.png', diff --git a/packages/backend/src/logger.ts b/packages/backend/src/logger.ts index b2ffbea984..1e506596be 100644 --- a/packages/backend/src/logger.ts +++ b/packages/backend/src/logger.ts @@ -22,13 +22,14 @@ const pinoPrettyStream = pinoPretty({ // eslint-disable-next-line import/no-default-export export default class Logger { - private readonly domain: string; - private logger: pino.Logger; + private readonly domain: string | undefined; + private readonly logger: pino.Logger; private context: Record = {}; - constructor(domain: string, _color?: KEYWORD, _store = true, parentLogger?: Logger) { + constructor(domain: string | undefined, _color?: KEYWORD, _store = true, parentLogger?: Logger) { if (parentLogger) { - this.domain = parentLogger.domain + '.' + domain; + this.domain = [parentLogger.domain, domain].filter(x => x).join('.') || undefined; + this.context = { ...JSON.parse(JSON.stringify(parentLogger.context)) }; } else { this.domain = domain; } @@ -50,18 +51,20 @@ export default class Logger { formatters: { level: (label, number) => ({ severity: label, level: number }), }, - mixin: () => ({ cluster: cluster.isPrimary ? 'primary' : `worker#${cluster.worker!.id}`, ...this.context }), + mixin: () => this.mixin(), }, !envOption.logJson ? pinoPrettyStream : undefined); } - @bindThis - public createSubLogger(domain: string, _color?: KEYWORD, _store = true): Logger { - return new Logger(domain, undefined, false, this); + private mixin(): Record { + return { cluster: cluster.isPrimary ? 'primary' : `worker#${cluster.worker!.id}`, ...this.context }; + } + + public createSubLogger(domain?: string, _color?: KEYWORD, _store = true): Logger { + return new Logger(domain, _color, _store, this); } - @bindThis public setContext(context: Record): void { - this.context = context; + this.context = { ...this.context, ...JSON.parse(JSON.stringify(context)) }; } @bindThis @@ -130,3 +133,6 @@ export default class Logger { this.logger.info({ context, important }, message); } } + +export const rootLogger = new Logger(undefined, undefined, false, undefined); +export const coreLogger = rootLogger.createSubLogger('core', 'cyan'); diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index d346b7afb6..649b2c2f9e 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -260,6 +260,12 @@ export class MiMeta { // chaptcha系を追加した際にはnodeinfoのレスポンスに追加するのを忘れないようにすること + @Column('varchar', { + length: 32, + nullable: true, + }) + public googleAnalyticsId: string | null; + @Column('enum', { enum: ['none', 'all', 'local', 'remote'], default: 'none', diff --git a/packages/backend/src/models/Poll.ts b/packages/backend/src/models/Poll.ts index ca985c8b24..b3d33a7266 100644 --- a/packages/backend/src/models/Poll.ts +++ b/packages/backend/src/models/Poll.ts @@ -8,7 +8,7 @@ import { noteVisibilities } from '@/types.js'; import { id } from './util/id.js'; import { MiNote } from './Note.js'; import type { MiUser } from './User.js'; -import type { MiChannel } from "@/models/Channel.js"; +import type { MiChannel } from '@/models/Channel.js'; @Entity('poll') export class MiPoll { diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts index bff1461149..7314a224d1 100644 --- a/packages/backend/src/models/json-schema/meta.ts +++ b/packages/backend/src/models/json-schema/meta.ts @@ -111,6 +111,10 @@ export const packedMetaLiteSchema = { type: 'string', optional: false, nullable: true, }, + googleAnalyticsId: { + type: 'string', + optional: false, nullable: true, + }, swPublickey: { type: 'string', optional: false, nullable: true, diff --git a/packages/backend/src/queue/processors/UserSuspendProcessorService.ts b/packages/backend/src/queue/processors/UserSuspendProcessorService.ts index 9f4c2576af..f2312863b3 100644 --- a/packages/backend/src/queue/processors/UserSuspendProcessorService.ts +++ b/packages/backend/src/queue/processors/UserSuspendProcessorService.ts @@ -13,7 +13,7 @@ import type { } from '@/models/_.js'; import { QueueLoggerService } from '@/queue/QueueLoggerService.js'; import type * as Bull from "bullmq"; -import type { DbUserSuspendJobData } from "@/queue/types.js"; +import type { DbUserSuspendJobData } from '@/queue/types.js'; @Injectable() export class UserSuspendProcessorService { diff --git a/packages/backend/src/server/api/SigninApiService.ts b/packages/backend/src/server/api/SigninApiService.ts index 58becdbc32..ed661a1fab 100644 --- a/packages/backend/src/server/api/SigninApiService.ts +++ b/packages/backend/src/server/api/SigninApiService.ts @@ -27,6 +27,7 @@ import { RateLimiterService } from './RateLimiterService.js'; import { SigninService } from './SigninService.js'; import type { AuthenticationResponseJSON } from '@simplewebauthn/types'; import type { FastifyReply, FastifyRequest } from 'fastify'; +import { randomUUID } from 'node:crypto'; @Injectable() export class SigninApiService { @@ -71,7 +72,7 @@ export class SigninApiService { reply: FastifyReply, ) { const logger = this.loggerService.getLogger('api:signin'); - logger.setContext({ username: request.body.username, ip: request.ip, headers: request.headers }); + logger.setContext({ username: request.body.username, ip: request.ip, headers: request.headers, span: request.headers['x-client-transaction-id'] ?? randomUUID() }); logger.info('Requested to sign in.'); reply.header('Access-Control-Allow-Origin', this.config.url); diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts index 2b2ece6c46..a0f909d93a 100644 --- a/packages/backend/src/server/api/SignupApiService.ts +++ b/packages/backend/src/server/api/SignupApiService.ts @@ -22,6 +22,7 @@ import { L_CHARS, secureRndstr } from '@/misc/secure-rndstr.js'; import { LoggerService } from '@/core/LoggerService.js'; import { SigninService } from './SigninService.js'; import type { FastifyRequest, FastifyReply } from 'fastify'; +import { randomUUID } from 'node:crypto'; @Injectable() export class SignupApiService { @@ -73,7 +74,7 @@ export class SignupApiService { reply: FastifyReply, ) { const logger = this.loggerService.getLogger('api:signup'); - logger.setContext({ username: request.body.username, email: request.body.emailAddress, ip: request.ip, headers: request.headers }); + logger.setContext({ username: request.body.username, email: request.body.emailAddress, ip: request.ip, headers: request.headers, span: request.headers['x-client-transaction-id'] ?? randomUUID() }); logger.info('Requested to create user account.'); const body = request.body; diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 3081facccb..2b9f5c6e3a 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -69,6 +69,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, + googleAnalyticsId: { + type: 'string', + optional: false, nullable: true, + }, swPublickey: { type: 'string', optional: false, nullable: true, @@ -557,6 +561,7 @@ export default class extends Endpoint { // eslint- recaptchaSiteKey: instance.recaptchaSiteKey, enableTurnstile: instance.enableTurnstile, turnstileSiteKey: instance.turnstileSiteKey, + googleAnalyticsId: instance.googleAnalyticsId, swPublickey: instance.swPublicKey, themeColor: instance.themeColor, mascotImageUrl: instance.mascotImageUrl, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 9948e06f89..73b20bf428 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -78,6 +78,7 @@ export const paramDef = { enableTurnstile: { type: 'boolean' }, turnstileSiteKey: { type: 'string', nullable: true }, turnstileSecretKey: { type: 'string', nullable: true }, + googleAnalyticsId: { type: 'string', nullable: true }, sensitiveMediaDetection: { type: 'string', enum: ['none', 'all', 'local', 'remote'] }, sensitiveMediaDetectionSensitivity: { type: 'string', enum: ['medium', 'low', 'high', 'veryLow', 'veryHigh'] }, setSensitiveFlagAutomatically: { type: 'boolean' }, @@ -374,6 +375,10 @@ export default class extends Endpoint { // eslint- set.turnstileSecretKey = ps.turnstileSecretKey; } + if (ps.googleAnalyticsId !== undefined) { + set.googleAnalyticsId = ps.googleAnalyticsId; + } + if (ps.sensitiveMediaDetection !== undefined) { set.sensitiveMediaDetection = ps.sensitiveMediaDetection; } diff --git a/packages/backend/src/server/api/endpoints/announcement.ts b/packages/backend/src/server/api/endpoints/announcement.ts index 98b1746ae3..1d333c1841 100644 --- a/packages/backend/src/server/api/endpoints/announcement.ts +++ b/packages/backend/src/server/api/endpoints/announcement.ts @@ -6,8 +6,8 @@ import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { AnnouncementService } from '@/core/AnnouncementService.js'; -import { EntityNotFoundError } from "typeorm"; -import { ApiError } from "../error.js"; +import { EntityNotFoundError } from 'typeorm'; +import { ApiError } from '@/server/api/error.js'; export const meta = { tags: ['meta'], diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts index 76c785fd9f..4ce0f299b2 100644 --- a/packages/backend/src/server/api/endpoints/federation/instances.ts +++ b/packages/backend/src/server/api/endpoints/federation/instances.ts @@ -80,7 +80,7 @@ export default class extends Endpoint { // eslint- ) { super(meta, paramDef, async (ps, me, _token, _file, _cleanup, ip, headers) => { const logger = this.loggerService.getLogger('api:federation:instances'); - logger.setContext({ params: ps, user: me?.id, ip, headers }); + logger.setContext({ params: ps, userId: me?.id, ip, headers }); logger.info('Requested to fetch federated instances.'); const query = this.instancesRepository.createQueryBuilder('instance'); diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts index 3f4008a065..4d6c60bad1 100644 --- a/packages/backend/src/server/api/endpoints/i.ts +++ b/packages/backend/src/server/api/endpoints/i.ts @@ -8,7 +8,9 @@ import type { UserProfilesRepository } from '@/models/_.js'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DI } from '@/di-symbols.js'; -import { ApiError } from '../error.js'; +import { ApiError } from '@/server/api/error.js'; +import { LoggerService } from '@/core/LoggerService.js'; +import { randomUUID } from 'node:crypto'; export const meta = { tags: ['account'], @@ -44,11 +46,16 @@ export default class extends Endpoint { // eslint- @Inject(DI.userProfilesRepository) private userProfilesRepository: UserProfilesRepository, + private loggerService: LoggerService, private userEntityService: UserEntityService, ) { - super(meta, paramDef, async (ps, user, token) => { + super(meta, paramDef, async (ps, user, token, _file, _cleanup, ip, headers) => { const isSecure = token == null; + const logger = this.loggerService.getLogger('api:account:i'); + logger.setContext({ userId: user?.id, username: user?.username, client: isSecure ? 'misskey' : 'app', ip, headers, span: (headers ? headers['x-client-transaction-id'] : undefined) ?? randomUUID() }); + logger.info('Fetching account information'); + const now = new Date(); const today = `${now.getFullYear()}/${now.getMonth() + 1}/${now.getDate()}`; @@ -71,11 +78,18 @@ export default class extends Endpoint { // eslint- userProfile.loggedInDates = [...userProfile.loggedInDates, today]; } - return await this.userEntityService.pack(userProfile.user!, userProfile.user!, { - schema: 'MeDetailed', - includeSecrets: isSecure, - userProfile, - }); + try { + const result = await this.userEntityService.pack(userProfile.user!, userProfile.user!, { + schema: 'MeDetailed', + includeSecrets: isSecure, + userProfile, + }); + logger.info('Returning account information'); + return result; + } catch (error) { + logger.error('Failed to pack user entity', { error }); + throw error; + } }); } } diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index c055ff3e31..fb3ea38f87 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -33,9 +33,9 @@ import type { Config } from '@/config.js'; import { safeForSql } from '@/misc/safe-for-sql.js'; import { AvatarDecorationService } from '@/core/AvatarDecorationService.js'; import { notificationRecieveConfig } from '@/models/json-schema/user.js'; -import { ApiLoggerService } from '../../ApiLoggerService.js'; -import { ApiError } from '../../error.js'; -import { IdService } from "@/core/IdService.js"; +import { ApiLoggerService } from '@/server/api/ApiLoggerService.js'; +import { ApiError } from '@/server/api/error.js'; +import { IdService } from '@/core/IdService.js'; export const meta = { tags: ['account'], diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index f6a57d8fe5..deb30e3cee 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -282,7 +282,7 @@ export class ClientServerService { }; const csp = this.config.contentSecurityPolicy ?? 'script-src \'self\' ' + - 'https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/ {scriptNonce}; ' + + 'https://challenges.cloudflare.com https://hcaptcha.com https://*.hcaptcha.com https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/ https://www.recaptcha.net/recaptcha/ https://www.googletagmanager.com/ {scriptNonce}; ' + 'worker-src blob: \'self\'; ' + 'base-uri \'self\'; object-src \'self\'; report-uri /csp-error'; reply.header('Content-Security-Policy-Report-Only', csp.replace('{scriptNonce}', `'nonce-${scriptNonce}'`)); diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts index 9dedd3a79d..d54f5f4313 100644 --- a/packages/backend/test/unit/chart.ts +++ b/packages/backend/test/unit/chart.ts @@ -19,7 +19,7 @@ import { entity as TestUniqueChartEntity } from '@/core/chart/charts/entities/te import { entity as TestIntersectionChartEntity } from '@/core/chart/charts/entities/test-intersection.js'; import { loadConfig } from '@/config.js'; import type { AppLockService } from '@/core/AppLockService.js'; -import Logger from '@/logger.js'; +import { coreLogger } from '@/logger.js'; describe('Chart', () => { const config = loadConfig(); @@ -63,7 +63,7 @@ describe('Chart', () => { await db.initialize(); - const logger = new Logger('chart'); // TODO: モックにする + const logger = coreLogger.createSubLogger('chart'); // TODO: モックにする testChart = new TestChart(db, appLockService, logger); testGroupedChart = new TestGroupedChart(db, appLockService, logger); testUniqueChart = new TestUniqueChart(db, appLockService, logger); diff --git a/packages/frontend/@types/vue-gtag.d.ts b/packages/frontend/@types/vue-gtag.d.ts new file mode 100644 index 0000000000..c300d516c8 --- /dev/null +++ b/packages/frontend/@types/vue-gtag.d.ts @@ -0,0 +1,14 @@ +declare module 'vue-gtag' { + export type GtagConsent = (command: 'consent', arg: 'default' | 'update', params: GtagConsentParams): void; + + export interface GtagConsentParams { + ad_storage?: 'granted' | 'denied', + ad_user_data?: 'granted' | 'denied', + ad_personalization?: 'granted' | 'denied', + analytics_storage?: 'granted' | 'denied', + functionality_storage?: 'granted' | 'denied', + personalization_storage?: 'granted' | 'denied', + security_storage?: 'granted' | 'denied', + wait_for_update?: number + } +} diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 2f3f07a482..2f3ba02625 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -75,6 +75,7 @@ "v-code-diff": "1.13.1", "vite": "5.4.9", "vue": "3.5.12", + "vue-gtag": "2.0.1", "vuedraggable": "next" }, "devDependencies": { diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts index 7f20e0b1a2..3ac9da773a 100644 --- a/packages/frontend/src/account.ts +++ b/packages/frontend/src/account.ts @@ -12,8 +12,10 @@ import { MenuButton } from '@/types/menu.js'; import { del, get, set } from '@/scripts/idb-proxy.js'; import { apiUrl } from '@/config.js'; import { waiting, popup, popupMenu, success, alert } from '@/os.js'; -import { misskeyApi } from '@/scripts/misskey-api.js'; +import { generateClientTransactionId, misskeyApi } from '@/scripts/misskey-api.js'; import { unisonReload, reloadChannel } from '@/scripts/unison-reload.js'; +import { set as gtagSet } from 'vue-gtag'; +import { instance } from '@/instance.js'; // TODO: 他のタブと永続化されたstateを同期 @@ -59,6 +61,7 @@ export async function signout() { }), headers: { 'Content-Type': 'application/json', + 'X-Client-Transaction-Id': generateClientTransactionId('misskey'), }, }); } @@ -109,6 +112,7 @@ function fetchAccount(token: string, id?: string, forceShowDialog?: boolean): Pr }), headers: { 'Content-Type': 'application/json', + 'X-Client-Transaction-Id': generateClientTransactionId('misskey'), }, }) .then(res => new Promise }>((done2, fail2) => { @@ -171,6 +175,12 @@ export function updateAccount(accountData: Partial) { $i[key] = value; } miLocalStorage.setItem('account', JSON.stringify($i)); + if (instance.googleAnalyticsId) { + gtagSet({ + 'client_id': miLocalStorage.getItem('id'), + 'user_id': $i.id, + }); + } } export async function refreshAccount() { diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index 1f459bb86e..aab787540f 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -23,6 +23,8 @@ import { deckStore } from '@/ui/deck/deck-store.js'; import { miLocalStorage } from '@/local-storage.js'; import { fetchCustomEmojis } from '@/custom-emojis.js'; import { setupRouter } from '@/router/definition.js'; +import { mainRouter } from '@/router/main.js'; +import VueGtag, { bootstrap as gtagBootstrap, GtagConsent, GtagConsentParams } from 'vue-gtag'; export async function common(createVue: () => App) { console.info(`Misskey v${version}`); @@ -60,6 +62,10 @@ export async function common(createVue: () => App) { }); } + if (miLocalStorage.getItem('id') === null) { + miLocalStorage.setItem('id', crypto.randomUUID()); + } + let isClientUpdated = false; //#region クライアントが更新されたかチェック @@ -260,6 +266,38 @@ export async function common(createVue: () => App) { directives(app); components(app); + if (instance.googleAnalyticsId) { + app.use(VueGtag, { + bootstrap: false, + appName: `Misskey v${version}`, + config: { + id: instance.googleAnalyticsId, + params: { + anonymize_ip: false, + send_page_view: true, + }, + }, + }, mainRouter); + + const gtagConsent = miLocalStorage.getItemAsJson('gtagConsent') as GtagConsentParams ?? { + ad_storage: 'denied', + ad_user_data: 'denied', + ad_personalization: 'denied', + analytics_storage: 'denied', + functionality_storage: 'denied', + personalization_storage: 'denied', + security_storage: 'granted', + }; + miLocalStorage.setItemAsJson('gtagConsent', gtagConsent); + + if (typeof window['gtag'] === 'function') (window['gtag'] as GtagConsent)('consent', 'default', gtagConsent); + + if (miLocalStorage.getItem('gaConsent') === 'true') { + // noinspection ES6MissingAwait + gtagBootstrap(); + } + } + // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210 // なぜか2回実行されることがあるため、mountするdivを1つに制限する const rootEl = ((): HTMLElement => { diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index 825213d3e6..bf91e1d1e3 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -20,6 +20,7 @@ import { initializeSw } from '@/scripts/initialize-sw.js'; import { deckStore } from '@/ui/deck/deck-store.js'; import { emojiPicker } from '@/scripts/emoji-picker.js'; import { mainRouter } from '@/router/main.js'; +import { instance } from '@/instance.js'; export async function mainBoot() { const { isClientUpdated } = await common(() => createApp( @@ -234,19 +235,25 @@ export async function mainBoot() { } miLocalStorage.setItem('lastUsed', Date.now().toString()); - const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt'); - const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo'); - if (neverShowDonationInfo !== 'true' && (createdAt.getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3))) && !location.pathname.startsWith('/miauth')) { - if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) { - popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed'); + if (!location.pathname.startsWith('/miauth') && !location.pathname.startsWith('/sso') && !location.pathname.startsWith('/oauth')) { + const latestDonationInfoShownAt = miLocalStorage.getItem('latestDonationInfoShownAt'); + const neverShowDonationInfo = miLocalStorage.getItem('neverShowDonationInfo'); + if (neverShowDonationInfo !== 'true' && (createdAt.getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 3)))) { + if (latestDonationInfoShownAt == null || (new Date(latestDonationInfoShownAt).getTime() < (Date.now() - (1000 * 60 * 60 * 24 * 30)))) { + popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {}, 'closed'); + } + } + + // const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read'); + // if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey') { + // popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed'); + // } + + if (instance.googleAnalyticsId && miLocalStorage.getItem('gaConsent') === null) { + popup(defineAsyncComponent(() => import('@/components/MkTrackingConsent.vue')), {}, {}, 'closed'); } } - // const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read'); - // if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey') { - // popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {}, 'closed'); - // } - if ('Notification' in window) { // 許可を得ていなかったらリクエスト if (Notification.permission === 'default') { diff --git a/packages/frontend/src/components/MkTrackingConsent.vue b/packages/frontend/src/components/MkTrackingConsent.vue new file mode 100644 index 0000000000..77228a6116 --- /dev/null +++ b/packages/frontend/src/components/MkTrackingConsent.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/packages/frontend/src/components/global/MkAd.vue b/packages/frontend/src/components/global/MkAd.vue index 04c50c9c47..4161be2a31 100644 --- a/packages/frontend/src/components/global/MkAd.vue +++ b/packages/frontend/src/components/global/MkAd.vue @@ -24,6 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only rel: 'nofollow noopener', target: '_blank', }" + @click="onAdClicked" > @@ -42,7 +43,8 @@ SPDX-License-Identifier: AGPL-3.0-only