diff options
| author | misskey-release-bot[bot] <157398866+misskey-release-bot[bot]@users.noreply.github.com> | 2025-01-28 12:29:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-28 12:29:14 +0000 |
| commit | 36880493cb16e87feb83484498fcd3cc871eb68d (patch) | |
| tree | 277127cf0e6c6990577935c5bb5dff9269c605b0 /packages/frontend/src/components/MkSubNoteContent.vue | |
| parent | Merge pull request #14924 from misskey-dev/develop (diff) | |
| parent | Release: 2025.1.0 (diff) | |
| download | misskey-36880493cb16e87feb83484498fcd3cc871eb68d.tar.gz misskey-36880493cb16e87feb83484498fcd3cc871eb68d.tar.bz2 misskey-36880493cb16e87feb83484498fcd3cc871eb68d.zip | |
Merge pull request #15279 from misskey-dev/develop
Release: 2025.1.0
Diffstat (limited to 'packages/frontend/src/components/MkSubNoteContent.vue')
| -rw-r--r-- | packages/frontend/src/components/MkSubNoteContent.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 9e02884b8c..5fb37ce8dc 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only </details> <details v-if="note.poll"> <summary>{{ i18n.ts.poll }}</summary> - <MkPoll :noteId="note.id" :poll="note.poll"/> + <MkPoll :noteId="note.id" :poll="note.poll" :author="note.user" :emojiUrls="note.emojis"/> </details> <button v-if="isLong && collapsed" :class="$style.fade" class="_button" @click="collapsed = false"> <span :class="$style.fadeLabel">{{ i18n.ts.showMore }}</span> @@ -32,10 +32,10 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; import * as Misskey from 'misskey-js'; +import { shouldCollapsed } from '@@/js/collapsed.js'; import MkMediaList from '@/components/MkMediaList.vue'; import MkPoll from '@/components/MkPoll.vue'; import { i18n } from '@/i18n.js'; -import { shouldCollapsed } from '@@/js/collapsed.js'; const props = defineProps<{ note: Misskey.entities.Note; |