Merge pull request #12022 from misskey-dev/misskey

This commit is contained in:
NoriDev 2023-10-13 16:10:25 +09:00
commit 323852b3be
3 changed files with 8 additions and 5 deletions

View file

@ -60,6 +60,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
- Fix: 브랜딩에서 적용한 이미지가 대화 페이지에서 반영되지 않음 - Fix: 브랜딩에서 적용한 이미지가 대화 페이지에서 반영되지 않음
- Fix: 유저 검색에서 로컬/리모트 설정이 제대로 작동하지 않음 - Fix: 유저 검색에서 로컬/리모트 설정이 제대로 작동하지 않음
- Fix: 유저 선택 다이얼로그에서 검색 결과가 표시되지 않음 - Fix: 유저 선택 다이얼로그에서 검색 결과가 표시되지 않음
- Fix: 게시 양식에서 사용자 변경 사항이 미리보기에 반영되지 않는 문제 (misskey-dev/misskey#12022)
### Server ### Server
- Feat: Note pack에서 SQL 디바운스 (MisskeyIO/misskey#176) - Feat: Note pack에서 SQL 디바운스 (MisskeyIO/misskey#176)

View file

@ -5,14 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div :class="$style.root"> <div :class="$style.root">
<MkAvatar v-if="!defaultStore.state.hideAvatarsInNote" :class="$style.avatar" :user="$i" link preview/> <MkAvatar v-if="!defaultStore.state.hideAvatarsInNote" :class="$style.avatar" :user="user" link preview/>
<div :class="$style.main"> <div :class="$style.main">
<div :class="$style.header"> <div :class="$style.header">
<MkUserName :user="$i" :nowrap="true"/> <MkUserName :user="user" :nowrap="true"/>
</div> </div>
<div> <div>
<div> <div>
<Mfm :text="text.trim()" :author="$i" :i="$i"/> <Mfm :text="text.trim()" :author="user" :i="user"/>
<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/> <MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
</div> </div>
</div> </div>
@ -22,15 +22,17 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
import * as Misskey from 'cherrypick-js';
import * as mfm from 'cherrypick-mfm-js'; import * as mfm from 'cherrypick-mfm-js';
import { $i } from '@/account.js';
import MkUrlPreview from '@/components/MkUrlPreview.vue'; import MkUrlPreview from '@/components/MkUrlPreview.vue';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
const props = defineProps<{ const props = defineProps<{
text: string; text: string;
user: Misskey.entities.User;
}>(); }>();
const urls = props.text ? extractUrlFromMfm(mfm.parse(props.text)) : null; const urls = props.text ? extractUrlFromMfm(mfm.parse(props.text)) : null;
</script> </script>

View file

@ -75,7 +75,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"> <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"/> <XPostFormAttaches v-model="files" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName" @replaceFile="replaceFile"/>
<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/> <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 v-if="showingOptions" style="padding: 8px 16px;">
</div> </div>
<footer :class="$style.footer"> <footer :class="$style.footer">