Merge 4628a8f9c0 into 3c81926f71

CHANGELOG.md

@@ -15,11 +15,12 @@
 - Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
 
 ### Server
+- Enhance: WebSocketの`meUpdated`イベントに更新後のアカウント情報を含まないように  
+  (Cherry-picked from https://github.com/okayurisotto/wisteria/commit/0d4cf43e61887c110a840f108ea5fea9afb1263b)
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
 - Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
 
-
 ## 2024.11.0
 
 ### Note

packages/backend/src/core/AccountMoveService.ts

@@ -96,7 +96,7 @@ export class AccountMoveService {
 
 		// Publish meUpdated event
 		const iObj = await this.userEntityService.pack(src.id, src, { schema: 'MeDetailed', includeSecrets: true });
-		this.globalEventService.publishMainStream(src.id, 'meUpdated', iObj);
+		this.globalEventService.publishMainStream(src.id, 'meUpdated');
 
 		// Unfollow after 24 hours
 		const followings = await this.followingsRepository.findBy({

packages/backend/src/core/GlobalEventService.ts

@@ -57,7 +57,7 @@ export interface MainEventTypes {
 	follow: Packed<'UserDetailedNotMe'>;
 	followed: Packed<'UserLite'>;
 	unfollow: Packed<'UserDetailedNotMe'>;
-	meUpdated: Packed<'MeDetailed'>;
+	meUpdated: undefined;
 	pageEvent: {
 		pageId: MiPage['id'];
 		event: string;

packages/backend/src/core/UserBlockingService.ts

@@ -108,9 +108,7 @@ export class UserBlockingService implements OnModuleInit {
 		});
 
 		if (this.userEntityService.isLocalUser(followee)) {
-			this.userEntityService.pack(followee, followee, {
+			this.globalEventService.publishMainStream(followee.id, 'meUpdated');
-				schema: 'MeDetailed',
-			}).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed));
 		}
 
 		if (this.userEntityService.isLocalUser(follower) && !silent) {

packages/backend/src/core/UserFollowingService.ts

@@ -544,9 +544,7 @@ export class UserFollowingService implements OnModuleInit {
 		if (this.userEntityService.isLocalUser(followee)) {
 			this.userEntityService.pack(follower.id, followee).then(packed => this.globalEventService.publishMainStream(followee.id, 'receiveFollowRequest', packed));
 
-			this.userEntityService.pack(followee.id, followee, {
+			this.globalEventService.publishMainStream(followee.id, 'meUpdated');
-				schema: 'MeDetailed',
-			}).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed));
 
 			// 通知を作成
 			this.notificationService.createNotification(followee.id, 'receiveFollowRequest', {
@@ -592,9 +590,7 @@ export class UserFollowingService implements OnModuleInit {
 			followerId: follower.id,
 		});
 
-		this.userEntityService.pack(followee.id, followee, {
+		this.globalEventService.publishMainStream(followee.id, 'meUpdated');
-			schema: 'MeDetailed',
-		}).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed));
 	}
 
 	@bindThis
@@ -619,9 +615,7 @@ export class UserFollowingService implements OnModuleInit {
 			this.deliverAccept(follower, followee as MiPartialLocalUser, request.requestId ?? undefined);
 		}
 
-		this.userEntityService.pack(followee.id, followee, {
+		this.globalEventService.publishMainStream(followee.id, 'meUpdated');
-			schema: 'MeDetailed',
-		}).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed));
 	}
 
 	@bindThis

packages/backend/src/server/ServerService.ts

@@ -212,10 +212,7 @@ export class ServerService implements OnApplicationShutdown {
 					emailVerifyCode: null,
 				});
 
-				this.globalEventService.publishMainStream(profile.userId, 'meUpdated', await this.userEntityService.pack(profile.userId, { id: profile.userId }, {
+				this.globalEventService.publishMainStream(profile.userId, 'meUpdated');
-					schema: 'MeDetailed',
-					includeSecrets: true,
-				}));
 
 				reply.code(200).send('Verification succeeded! メールアドレスの認証に成功しました。');
 				return;

packages/backend/src/server/api/endpoints/i/2fa/done.ts

@@ -6,7 +6,6 @@
 import * as OTPAuth from 'otpauth';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { UserProfilesRepository } from '@/models/_.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
@@ -44,7 +43,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.userProfilesRepository)
 		private userProfilesRepository: UserProfilesRepository,
 
-		private userEntityService: UserEntityService,
 		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -76,10 +74,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 
 			return {
 				backupCodes: backupCodes,

packages/backend/src/server/api/endpoints/i/2fa/key-done.ts

@@ -6,7 +6,6 @@
 import bcrypt from 'bcryptjs';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/_.js';
@@ -67,7 +66,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		private webAuthnService: WebAuthnService,
 		private userAuthService: UserAuthService,
-		private userEntityService: UserEntityService,
 		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -110,10 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 
 			return {
 				id: keyId,

packages/backend/src/server/api/endpoints/i/2fa/password-less.ts

@@ -5,7 +5,6 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/_.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
@@ -42,7 +41,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.userSecurityKeysRepository)
 		private userSecurityKeysRepository: UserSecurityKeysRepository,
 
-		private userEntityService: UserEntityService,
 		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -73,10 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 		});
 	}
 }

packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts

@@ -7,7 +7,6 @@ import bcrypt from 'bcryptjs';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UserProfilesRepository, UserSecurityKeysRepository } from '@/models/_.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '@/server/api/error.js';
@@ -46,7 +45,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.userProfilesRepository)
 		private userProfilesRepository: UserProfilesRepository,
 
-		private userEntityService: UserEntityService,
 		private userAuthService: UserAuthService,
 		private globalEventService: GlobalEventService,
 	) {
@@ -96,10 +94,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 
 			return {};
 		});

packages/backend/src/server/api/endpoints/i/2fa/unregister.ts

@@ -6,7 +6,6 @@
 import bcrypt from 'bcryptjs';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { UserProfilesRepository } from '@/models/_.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
@@ -42,7 +41,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.userProfilesRepository)
 		private userProfilesRepository: UserProfilesRepository,
 
-		private userEntityService: UserEntityService,
 		private userAuthService: UserAuthService,
 		private globalEventService: GlobalEventService,
 	) {
@@ -75,10 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 		});
 	}
 }

packages/backend/src/server/api/endpoints/i/2fa/update-key.ts

@@ -7,7 +7,6 @@ import bcrypt from 'bcryptjs';
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import type { UserSecurityKeysRepository } from '@/models/_.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
@@ -47,7 +46,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.userSecurityKeysRepository)
 		private userSecurityKeysRepository: UserSecurityKeysRepository,
 
-		private userEntityService: UserEntityService,
 		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
@@ -68,10 +66,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, {
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
-				schema: 'MeDetailed',
-				includeSecrets: true,
-			}));
 
 			return {};
 		});

packages/backend/src/server/api/endpoints/i/update-email.ts

@@ -122,7 +122,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			});
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(me.id, 'meUpdated', iObj);
+			this.globalEventService.publishMainStream(me.id, 'meUpdated');
 
 			if (ps.email != null) {
 				const code = secureRndstr(16, { chars: L_CHARS });

packages/backend/src/server/api/endpoints/i/update.ts

@@ -527,7 +527,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			this.cacheService.userProfileCache.set(user.id, updatedProfile);
 
 			// Publish meUpdated event
-			this.globalEventService.publishMainStream(user.id, 'meUpdated', iObj);
+			this.globalEventService.publishMainStream(user.id, 'meUpdated');
 
 			// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
 			if (user.isLocked && ps.isLocked === false) {

packages/frontend/src/boot/main-boot.ts

@@ -11,7 +11,7 @@ import { i18n } from '@/i18n.js';
 import { alert, confirm, popup, post, toast } from '@/os.js';
 import { useStream } from '@/stream.js';
 import * as sound from '@/scripts/sound.js';
-import { $i, signout, updateAccountPartial } from '@/account.js';
+import { $i, refreshAccount, signout, updateAccountPartial } from '@/account.js';
 import { instance } from '@/instance.js';
 import { ColdDeviceStorage, defaultStore } from '@/store.js';
 import { reactionPicker } from '@/scripts/reaction-picker.js';
@@ -320,8 +320,8 @@ export async function mainBoot() {
 		const main = markRaw(stream.useChannel('main', null, 'System'));
 
 		// 自分の情報が更新されたとき
-		main.on('meUpdated', i => {
+		main.on('meUpdated', () => {
-			updateAccountPartial(i);
+			refreshAccount();
 		});
 
 		main.on('readAllNotifications', () => {

packages/misskey-js/etc/misskey-js.api.md

@@ -598,7 +598,7 @@ export type Channels = {
             follow: (payload: UserDetailedNotMe) => void;
             followed: (payload: UserDetailed | UserLite) => void;
             unfollow: (payload: UserDetailed) => void;
-            meUpdated: (payload: UserDetailed) => void;
+            meUpdated: () => void;
             pageEvent: (payload: PageEvent) => void;
             urlUploadFinished: (payload: {
                 marker: string;

packages/misskey-js/src/streaming.types.ts

@@ -41,7 +41,7 @@ export type Channels = {
 			follow: (payload: UserDetailedNotMe) => void; // 自分が他人をフォローしたとき
 			followed: (payload: UserDetailed | UserLite) => void; // 他人が自分をフォローしたとき
 			unfollow: (payload: UserDetailed) => void; // 自分が他人をフォロー解除したとき
-			meUpdated: (payload: UserDetailed) => void;
+			meUpdated: () => void;
 			pageEvent: (payload: PageEvent) => void;
 			urlUploadFinished: (payload: { marker: string; file: DriveFile; }) => void;
 			readAllNotifications: () => void;