From 3902b82470354889bdec9c6cae50b5d42da92584 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Thu, 4 Apr 2024 16:13:56 +0800
Subject: [PATCH] fix type errors of MkMisskeyFlavoredMarkdown.vue
---
packages/client/src/components/global/MkEmoji.vue | 2 +-
.../src/components/global/MkMisskeyFlavoredMarkdown.vue | 8 ++++----
packages/client/src/components/mfm.ts | 4 +++-
packages/firefish-js/src/entities.ts | 5 +++++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/packages/client/src/components/global/MkEmoji.vue b/packages/client/src/components/global/MkEmoji.vue
index 1e8abbb650..ba9b689905 100644
--- a/packages/client/src/components/global/MkEmoji.vue
+++ b/packages/client/src/components/global/MkEmoji.vue
@@ -32,7 +32,7 @@ const props = defineProps<{
emoji: string;
normal?: boolean;
noStyle?: boolean;
- customEmojis?: entities.CustomEmoji[];
+ customEmojis?: entities.EmojiLite[];
isReaction?: boolean;
}>();
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index e8662fb922..3fe805b5b4 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -19,14 +19,15 @@
import {} from "vue";
import MfmCore from "@/components/mfm";
import { defaultStore } from "@/store";
+import type { entities } from "firefish-js";
-const props = withDefaults(
+withDefaults(
defineProps<{
text: string;
plain?: boolean;
nowrap?: boolean;
- author?: any;
- customEmojis?: any;
+ author?: entities.User;
+ customEmojis?: entities.EmojiLite[];
isNote?: boolean;
advancedMfm?: boolean;
lang?: string;
@@ -34,7 +35,6 @@ const props = withDefaults(
{
plain: false,
nowrap: false,
- author: null,
isNote: true,
},
);
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 004ccf4a94..aa526f1173 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -1,6 +1,6 @@
import { defineComponent, h } from "vue";
import * as mfm from "mfm-js";
-import type { VNode } from "vue";
+import type { VNode, PropType } from "vue";
import MkUrl from "@/components/global/MkUrl.vue";
import MkLink from "@/components/MkLink.vue";
import MkMention from "@/components/MkMention.vue";
@@ -14,6 +14,7 @@ import MkA from "@/components/global/MkA.vue";
import { host } from "@/config";
import { reducedMotion } from "@/scripts/reduced-motion";
import { defaultStore } from "@/store";
+import type { entities } from "firefish-js";
export default defineComponent({
props: {
@@ -38,6 +39,7 @@ export default defineComponent({
default: null,
},
customEmojis: {
+ type: Array as PropType<entities.EmojiLite[]>,
required: false,
},
isNote: {
diff --git a/packages/firefish-js/src/entities.ts b/packages/firefish-js/src/entities.ts
index a628f038e1..5ecf7d7b66 100644
--- a/packages/firefish-js/src/entities.ts
+++ b/packages/firefish-js/src/entities.ts
@@ -321,6 +321,11 @@ export type CustomEmoji = {
aliases: string[];
};
+export type EmojiLite = {
+ name: string;
+ url: string;
+};
+
export type LiteInstanceMetadata = {
maintainerName: string | null;
maintainerEmail: string | null;