From 0b7ab1b90dc97e94007a5c17251c921fc9282019 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Wed, 10 Apr 2024 22:45:01 +0800
Subject: [PATCH] fix type errors of MkChatPreview

---
 .../client/src/components/MkChatPreview.vue   | 24 +++++++++++--------
 packages/firefish-js/src/entities.ts          |  4 +++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue
index 1b330b7b2d..6976a3f18a 100644
--- a/packages/client/src/components/MkChatPreview.vue
+++ b/packages/client/src/components/MkChatPreview.vue
@@ -4,14 +4,14 @@
 		:class="{
 			isMe: isMe(message),
 			isRead: message.groupId
-				? message.reads.includes(me?.id)
+				? message.reads.includes(me!.id)
 				: message.isRead,
 		}"
 		:to="
 			message.groupId
 				? `/my/messaging/group/${message.groupId}`
 				: `/my/messaging/${acct.toString(
-						isMe(message) ? message.recipient : message.user,
+						isMe(message) ? message.recipient! : message.user,
 					)}`
 		"
 	>
@@ -22,27 +22,27 @@
 					message.groupId
 						? message.user
 						: isMe(message)
-							? message.recipient
+							? message.recipient!
 							: message.user
 				"
 				:show-indicator="true"
 				disable-link
 			/>
 			<header v-if="message.groupId">
-				<span class="name">{{ message.group.name }}</span>
+				<span class="name">{{ message.group!.name }}</span>
 				<MkTime :time="message.createdAt" class="time" />
 			</header>
 			<header v-else>
 				<span class="name"
 					><MkUserName
 						:user="
-							isMe(message) ? message.recipient : message.user
+							isMe(message) ? message.recipient! : message.user
 						"
 				/></span>
 				<span class="username"
 					>@{{
 						acct.toString(
-							isMe(message) ? message.recipient : message.user,
+							isMe(message) ? message.recipient! : message.user,
 						)
 					}}</span
 				>
@@ -65,16 +65,20 @@
 </template>
 
 <script lang="ts" setup>
-import { acct } from "firefish-js";
+import { acct, type entities } from "firefish-js";
 import { i18n } from "@/i18n";
 import { me } from "@/me";
 
+if (me == null) {
+	throw "No me";
+}
+
 defineProps<{
-	message: Record<string, any>;
+	message: entities.MessagingMessage;
 }>();
 
-function isMe(message): boolean {
-	return message.userId === me?.id;
+function isMe(message: entities.MessagingMessage): boolean {
+	return message.userId === me!.id;
 }
 </script>
 
diff --git a/packages/firefish-js/src/entities.ts b/packages/firefish-js/src/entities.ts
index 74e97f2781..16cef32827 100644
--- a/packages/firefish-js/src/entities.ts
+++ b/packages/firefish-js/src/entities.ts
@@ -76,7 +76,9 @@ export type UserDetailed = UserLite & {
 	url: string | null;
 };
 
-export type UserGroup = TODO;
+export type UserGroup = {
+	id: ID;
+} & Record<string, TODO>;
 
 export type UserList = {
 	id: ID;