diff --git a/CHANGELOG.md b/CHANGELOG.md index fd56700e1f..81e9a28774 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts index 24d11f29ff..69824ca69f 100644 --- a/packages/backend/src/core/AccountMoveService.ts +++ b/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({ diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts index 03646ff566..6311c1df02 100644 --- a/packages/backend/src/core/GlobalEventService.ts +++ b/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; diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts index 2f1310b8ef..531f1d5d14 100644 --- a/packages/backend/src/core/UserBlockingService.ts +++ b/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, { - schema: 'MeDetailed', - }).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed)); + this.globalEventService.publishMainStream(followee.id, 'meUpdated'); } if (this.userEntityService.isLocalUser(follower) && !silent) { diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index 8963003057..8c544fc739 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/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, { - schema: 'MeDetailed', - }).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed)); + this.globalEventService.publishMainStream(followee.id, 'meUpdated'); // 通知を作成 this.notificationService.createNotification(followee.id, 'receiveFollowRequest', { @@ -592,9 +590,7 @@ export class UserFollowingService implements OnModuleInit { followerId: follower.id, }); - this.userEntityService.pack(followee.id, followee, { - schema: 'MeDetailed', - }).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed)); + this.globalEventService.publishMainStream(followee.id, 'meUpdated'); } @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, { - schema: 'MeDetailed', - }).then(packed => this.globalEventService.publishMainStream(followee.id, 'meUpdated', packed)); + this.globalEventService.publishMainStream(followee.id, 'meUpdated'); } @bindThis diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts index fd2bd3267d..96a019948e 100644 --- a/packages/backend/src/server/ServerService.ts +++ b/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 }, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(profile.userId, 'meUpdated'); reply.code(200).send('Verification succeeded! メールアドレスの認証に成功しました。'); return; diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts index 2a30e8b0c3..c42d1facfd 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts +++ b/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 { // 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 { // eslint- }); // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); return { backupCodes: backupCodes, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index 65eece5b97..cd70693a10 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/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 { 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 { }); // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); return { id: keyId, diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts index bf039ccd16..8bc46d2ff1 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts +++ b/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 { // 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 { // eslint- }); // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); }); } } diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts index c350136eae..b411e066af 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/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 { // 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 { // eslint- } // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); return {}; }); diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts index b5a53cc889..fe718ef09a 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts +++ b/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 { // 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 { // eslint- }); // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); }); } } diff --git a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts index cfa07cc8d7..fe2a248742 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts +++ b/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 { // 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 { // eslint- }); // Publish meUpdated event - this.globalEventService.publishMainStream(me.id, 'meUpdated', await this.userEntityService.pack(me.id, me, { - schema: 'MeDetailed', - includeSecrets: true, - })); + this.globalEventService.publishMainStream(me.id, 'meUpdated'); return {}; }); diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts index da1faee30d..aafd99c0eb 100644 --- a/packages/backend/src/server/api/endpoints/i/update-email.ts +++ b/packages/backend/src/server/api/endpoints/i/update-email.ts @@ -122,7 +122,7 @@ export default class extends Endpoint { // 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 }); diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index d3eeb75b27..90672339b1 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -527,7 +527,7 @@ export default class extends Endpoint { // 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) { diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index 2bf9029479..89281d1243 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/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 => { - updateAccountPartial(i); + main.on('meUpdated', () => { + refreshAccount(); }); main.on('readAllNotifications', () => { diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md index 01a3dbbb30..3bb5f7d6c5 100644 --- a/packages/misskey-js/etc/misskey-js.api.md +++ b/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; diff --git a/packages/misskey-js/src/streaming.types.ts b/packages/misskey-js/src/streaming.types.ts index 26a50f9fa4..fce9dce1fd 100644 --- a/packages/misskey-js/src/streaming.types.ts +++ b/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;