usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
mattyatea 2024-05-17 11:44:57 +09:00
parent ab94d15d38
commit ce3a019d81
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/components/MkEmojiEditDialog.vue
View File

@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkInput v-model="text"> <MkInput v-model="text">
<template #label>テスト文章</template> <template #label>テスト文章</template>
</MkInput><br/> </MkInput><br/>
<MkNoteSimple :note="{isHidden:false,replyId:null,renoteId:null,files:[],user: $i,text:text,cw:null, emojis: {[name]: imgUrl}}"/> <MkNoteSimple :emojireq="true" :note="{isHidden:false,replyId:null,renoteId:null,files:[],user: $i,text:text,cw:null, emojis: {[name]: imgUrl}}"/>
<p v-if="speed ">基準より眩しい可能性があります。</p> <p v-if="speed ">基準より眩しい可能性があります。</p>
<p v-if="!speed">問題は見つかりませんでした。</p> <p v-if="!speed">問題は見つかりませんでした。</p>
<p>※上記の物は問題がないことを保証するものではありません。</p> <p>※上記の物は問題がないことを保証するものではありません。</p>

3
packages/frontend/src/components/MkNoteSimple.vue
View File

@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkNoteHeader :class="$style.header" :note="note" :mini="true"/> <MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
<div> <div>
<p v-if="note.cw != null" :class="$style.cw"> <p v-if="note.cw != null" :class="$style.cw">
<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/> <Mfm v-if="note.cw != ''" :emojireq="emojireq" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/> <MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/>
</p> </p>
<div v-show="note.cw == null || showContent"> <div v-show="note.cw == null || showContent">
@ -42,6 +42,7 @@ const props = defineProps<{
isSchedule?: boolean; isSchedule?: boolean;
scheduledNoteId?: string; scheduledNoteId?: string;
}; };
emojireq:boolean;
}>(); }>();
const emit = defineEmits<{ const emit = defineEmits<{

3
packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
View File

@ -39,6 +39,7 @@ type MfmProps = {
text: string; text: string;
plain?: boolean; plain?: boolean;
nowrap?: boolean; nowrap?: boolean;
emojireq?: boolean;
author?: { author?: {
id: ID; id: ID;
username: string; username: string;
@ -474,7 +475,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
case 'emojiCode': { case 'emojiCode': {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (props.author?.host == null ) { if (props.author?.host == null && props.emojireq ) {
return [h(MkCustomEmoji, { return [h(MkCustomEmoji, {
key: Math.random(), key: Math.random(),
name: token.props.name, name: token.props.name,