summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorzyoshoka <107108195+zyoshoka@users.noreply.github.com>2023-10-22 15:51:48 +0900
committerGitHub <noreply@github.com>2023-10-22 15:51:48 +0900
commit983b1e63df5a3f535fcd98f11d709d6c45d7aa0e (patch)
tree027fbe1d7a267af68bbeeddd006790af85099245 /packages/frontend/src/components
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-983b1e63df5a3f535fcd98f11d709d6c45d7aa0e.tar.gz
sharkey-983b1e63df5a3f535fcd98f11d709d6c45d7aa0e.tar.bz2
sharkey-983b1e63df5a3f535fcd98f11d709d6c45d7aa0e.zip
fix(frontend): 投稿フォームでのユーザー変更がプレビューに反映されるように修正 (#12022)
* fix(frontend): 投稿フォームでのユーザー変更がプレビューに反映されるように修正 * Update CHANGELOG.md
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkNotePreview.vue9
-rw-r--r--packages/frontend/src/components/MkPostForm.vue2
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/frontend/src/components/MkNotePreview.vue b/packages/frontend/src/components/MkNotePreview.vue
index fc6ea89085..923c240cf0 100644
--- a/packages/frontend/src/components/MkNotePreview.vue
+++ b/packages/frontend/src/components/MkNotePreview.vue
@@ -5,14 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div :class="$style.root">
- <MkAvatar :class="$style.avatar" :user="$i" link preview/>
+ <MkAvatar :class="$style.avatar" :user="user" link preview/>
<div :class="$style.main">
<div :class="$style.header">
- <MkUserName :user="$i" :nowrap="true"/>
+ <MkUserName :user="user" :nowrap="true"/>
</div>
<div>
<div>
- <Mfm :text="text.trim()" :author="$i" :i="$i"/>
+ <Mfm :text="text.trim()" :author="user" :i="user"/>
</div>
</div>
</div>
@@ -21,10 +21,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { } from 'vue';
-import { $i } from '@/account.js';
+import * as Misskey from 'misskey-js';
const props = defineProps<{
text: string;
+ user: Misskey.entities.User;
}>();
</script>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index f6981cea72..598846b166 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -73,7 +73,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
<XPostFormAttaches v-model="files" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName" @replaceFile="replaceFile"/>
<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
- <MkNotePreview v-if="showPreview" :class="$style.preview" :text="text"/>
+ <MkNotePreview v-if="showPreview" :class="$style.preview" :text="text" :user="postAccount ?? $i"/>
<div v-if="showingOptions" style="padding: 8px 16px;">
</div>
<footer :class="$style.footer">