From 73f06e591ab1aecd780fd7f1e1181b86c29b3f7e Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 8 Feb 2023 20:07:19 +0900 Subject: [PATCH] revert: 650187deaf --- packages/backend/src/core/CustomEmojiService.ts | 8 ++++++++ .../src/core/entities/UserEntityService.ts | 2 +- .../frontend/src/components/MkAbuseReport.vue | 2 +- .../frontend/src/components/MkAutocomplete.vue | 2 +- packages/frontend/src/components/MkMenu.vue | 2 +- packages/frontend/src/components/MkNote.vue | 4 ++-- .../frontend/src/components/MkNoteDetailed.vue | 6 +++--- packages/frontend/src/components/MkNoteHeader.vue | 2 +- .../frontend/src/components/MkNotePreview.vue | 2 +- .../frontend/src/components/MkNotification.vue | 2 +- .../src/components/MkReactionsViewer.details.vue | 2 +- .../frontend/src/components/MkUserCardMini.vue | 2 +- packages/frontend/src/components/MkUserInfo.vue | 2 +- .../frontend/src/components/MkUserPreview.vue | 2 +- .../src/components/MkUserSelectDialog.vue | 4 ++-- .../frontend/src/components/MkUsersTooltip.vue | 2 +- .../global/MkMisskeyFlavoredMarkdown.vue | 9 ++++++++- .../src/components/global/MkPageHeader.vue | 2 +- .../frontend/src/components/global/MkUserName.vue | 15 +++++++++++++++ packages/frontend/src/components/index.ts | 3 +++ packages/frontend/src/pages/clip.vue | 2 +- packages/frontend/src/pages/follow-requests.vue | 2 +- packages/frontend/src/pages/gallery/post.vue | 2 +- packages/frontend/src/pages/messaging/index.vue | 2 +- packages/frontend/src/pages/my-lists/list.vue | 2 +- packages/frontend/src/pages/note.vue | 2 +- packages/frontend/src/pages/page.vue | 2 +- packages/frontend/src/pages/settings/accounts.vue | 4 +++- packages/frontend/src/pages/user-info.vue | 2 +- packages/frontend/src/pages/user/home.vue | 4 ++-- packages/frontend/src/widgets/WidgetProfile.vue | 4 +++- 31 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 packages/frontend/src/components/global/MkUserName.vue diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 3ac796fb2f8b..63f0319442f5 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -150,9 +150,17 @@ export class CustomEmojiService { if (note.renote) { emojis = emojis.concat(note.renote.emojis .map(e => this.parseEmojiStr(e, note.renote!.userHost))); + if (note.renote.user) { + emojis = emojis.concat(note.renote.user.emojis + .map(e => this.parseEmojiStr(e, note.renote!.userHost))); + } } const customReactions = Object.keys(note.reactions).map(x => this.reactionService.decodeReaction(x)).filter(x => x.name != null) as typeof emojis; emojis = emojis.concat(customReactions); + if (note.user) { + emojis = emojis.concat(note.user.emojis + .map(e => this.parseEmojiStr(e, note.userHost))); + } } return emojis.filter(x => x.name != null && x.host != null) as { name: string; host: string; }[]; } diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 09b69d509a64..eea9d5567d16 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -413,6 +413,7 @@ export class UserEntityService implements OnModuleInit { faviconUrl: instance.faviconUrl, themeColor: instance.themeColor, } : undefined) : undefined, + emojis: this.customEmojiService.populateEmojis(user.emojis, user.host), onlineStatus: this.getOnlineStatus(user), // パフォーマンス上の理由でローカルユーザーのみ badgeRoles: user.host == null ? this.roleService.getUserBadgeRoles(user.id).then(rs => rs.map(r => ({ @@ -463,7 +464,6 @@ export class UserEntityService implements OnModuleInit { isModerator: role.isModerator, isAdministrator: role.isAdministrator, }))), - emojis: this.customEmojiService.populateEmojis(user.emojis, user.host), } : {}), ...(opts.detail && isMe ? { diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue index 701dd8bb3d59..0e18a5a83d28 100644 --- a/packages/frontend/src/components/MkAbuseReport.vue +++ b/packages/frontend/src/components/MkAbuseReport.vue @@ -4,7 +4,7 @@
- {{ report.targetUser.name ?? report.targetUser.username }} +
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue index 595e393e0138..e523b988b087 100644 --- a/packages/frontend/src/components/MkAutocomplete.vue +++ b/packages/frontend/src/components/MkAutocomplete.vue @@ -4,7 +4,7 @@
  • - {{ user.name ?? user.username }} + @{{ acct(user) }}
  • diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 2185a3ed086c..eee77a9475c7 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -27,7 +27,7 @@ diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index a77158c86287..351861ac17dc 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -17,7 +17,7 @@ @@ -108,7 +108,7 @@ diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index b632a77396c7..0da06c4f145a 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -16,7 +16,7 @@ @@ -39,7 +39,7 @@
    - {{ appearNote.user.name ?? appearNote.user.username }} + bot
    @@ -125,7 +125,7 @@ diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index d86a37ed550e..6b43f146650b 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -1,7 +1,7 @@