diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:35:14 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:35:14 +0100 |
| commit | 34c1e9ea2b6389e4bcc86864bcfc34f449e4f677 (patch) | |
| tree | 3f67f257580a84e305ad5c1eb02e36ae5e2f0dc6 /packages/frontend/src/components | |
| parent | revert AiScript hack for plugins (diff) | |
| parent | merge: don't send real-time updates of replies to blocked users #457 #573 (!566) (diff) | |
| download | sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.tar.gz sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.tar.bz2 sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.zip | |
Merge branch 'develop' into feature/misskey-2024.07
fixing conflicts in `package.json`
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 7df84a70db..70651507ed 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only > <div v-if="appearNote.reply && inReplyToCollapsed" :class="$style.collapsedInReplyTo"> <MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/> - <MkA v-user-preview="note.user.id" :class="$style.name" :to="userPage(note.user)"> + <MkA v-user-preview="appearNote.reply.userId" :class="$style.name" :to="userPage(appearNote.reply.user)"> <MkAcct :user="appearNote.reply.user"/> </MkA>: <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/> |