From 6f7cfa82b5c591ea47e5556f14c33067d09be391 Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 8 Feb 2023 09:50:34 +0000 Subject: [PATCH 1/5] =?UTF-8?q?fix(client):=20=E9=80=9A=E7=9F=A5=E3=81=AE?= =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E8=A1=A8=E7=A4=BA=E3=81=A7=5Fnowrap?= =?UTF-8?q?=E3=81=8C=E5=8A=B9=E3=81=84=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20Fix=20#9834?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ packages/frontend/src/style.scss | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00d69dbd1..1c4efdea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ You should also include the user name that made the change. --> +## 13.x.x (unreleased) + +### Improvements + +### Bugfixes +- Client: 通知のノート表示で_nowrapが効いていない問題を修正 + ## 13.5.0 (2023/02/08) ### Changes diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss index bacdc967d..88e15abdb 100644 --- a/packages/frontend/src/style.scss +++ b/packages/frontend/src/style.scss @@ -157,9 +157,9 @@ hr { } ._nowrap { - white-space: pre; - word-wrap: normal; // https://codeday.me/jp/qa/20190424/690106.html - overflow: clip; + white-space: pre !important; + word-wrap: normal !important; // https://codeday.me/jp/qa/20190424/690106.html + overflow: hidden; text-overflow: ellipsis; } From 73f06e591ab1aecd780fd7f1e1181b86c29b3f7e Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 8 Feb 2023 20:07:19 +0900 Subject: [PATCH 2/5] 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 3ac796fb2..63f031944 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 09b69d509..eea9d5567 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 701dd8bb3..0e18a5a83 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 595e393e0..e523b988b 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 2185a3ed0..eee77a947 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 a77158c86..351861ac1 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 b632a7739..0da06c4f1 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 d86a37ed5..6b43f1466 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -1,7 +1,7 @@