@satorijs/adapter-lark 3.6.0 → 3.6.1

package/src/types/message/index.ts

@@ -1,24 +1,7 @@
-import { Lark } from '..'
-import { MessageContent } from './content'
+import { Lark, MessageContent } from '..'
 
 export * from './content'
 
-export type MessageType = 'text' | 'post' | 'image' | 'file' | 'audio' | 'media' | 'sticker' | 'interactive' | 'share_chat' | 'share_user'
-
-export interface MessageContentMap {
-  'text': MessageContent.Text
-  'post': MessageContent.RichText
-  'image': MessageContent.Image
-  'file': MessageContent.File
-  'audio': MessageContent.Audio
-  'media': MessageContent.Media
-  'sticker': MessageContent.Sticker
-  'share_chat': MessageContent.ShareChat
-  'share_user': MessageContent.ShareUser
-}
-
-export type MessageContentType<T extends MessageType> = T extends keyof MessageContentMap ? MessageContentMap[T] : any
-
 declare module '../event' {
   export interface Events {
     /**
@@ -38,7 +21,7 @@ declare module '../event' {
         create_time: string
         chat_id: string
         chat_type: string
-        message_type: MessageType
+        message_type: keyof MessageContent
         content: string
         mentions: {
           key: string

package/src/utils.ts

@@ -1,7 +1,7 @@
 import crypto from 'crypto'
 import { Context, h, Session, trimSlash, Universal } from '@satorijs/core'
-import { FeishuBot, LarkBot } from './bot'
-import { EventPayload, Events, GetImChatResponse, Lark, MessageContentType, MessageType } from './types'
+import { LarkBot } from './bot'
+import { EventPayload, Events, GetImChatResponse, Lark } from './types'
 
 export type Sender =
   | {
@@ -22,8 +22,8 @@ export function adaptSender(sender: Sender, session: Session): Session {
   return session
 }
 
-export async function adaptMessage(bot: FeishuBot, data: Events['im.message.receive_v1'], session: Session, details = true): Promise<Session> {
-  const json = JSON.parse(data.message.content) as MessageContentType<MessageType>
+export async function adaptMessage(bot: LarkBot, data: Events['im.message.receive_v1'], session: Session, details = true): Promise<Session> {
+  const json = JSON.parse(data.message.content)
   const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.server.config.selfUrl) + bot.config.path + '/assets'
   const content: (string | h)[] = []
   switch (data.message.message_type) {
@@ -71,7 +71,7 @@ export async function adaptMessage(bot: FeishuBot, data: Events['im.message.rece
   return session
 }
 
-export async function adaptSession<C extends Context>(bot: FeishuBot<C>, body: EventPayload) {
+export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: EventPayload) {
   const session = bot.session()
   session.setInternal('lark', body)
 
@@ -119,7 +119,7 @@ export async function adaptSession<C extends Context>(bot: FeishuBot<C>, body: E
 
 // TODO: This function has many duplicated code with `adaptMessage`, should refactor them
 export async function decodeMessage(bot: LarkBot, body: Lark.Message, details = true): Promise<Universal.Message> {
-  const json = JSON.parse(body.body.content) as MessageContentType<MessageType>
+  const json = JSON.parse(body.body.content)
   const assetEndpoint = trimSlash(bot.config.selfUrl ?? bot.ctx.server.config.selfUrl) + bot.config.path + '/assets'
   const content: h[] = []
   switch (body.msg_type) {