@satorijs/adapter-lark 3.10.5 → 3.11.0

package/src/types/workplace.ts

@@ -1,59 +1,83 @@
-import { BlockAccessData, CustomWorkplaceAccessData, WorkplaceAccessData } from '.'
-import { Internal, Pagination } from '../internal'
+import * as Lark from '.'
+import { Internal, Paginated, Pagination } from '../internal'
 
 declare module '../internal' {
   interface Internal {
-    /**
-     * 获取工作台访问数据
-     * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/workplace_access_data/search
-     */
-    searchWorkplaceWorkplaceAccessData(query?: SearchWorkplaceWorkplaceAccessDataQuery): Paginated<WorkplaceAccessData>
-    /**
-     * 获取定制工作台访问数据
-     * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/custom_workplace_access_data/search
-     */
-    searchWorkplaceCustomWorkplaceAccessData(query?: SearchWorkplaceCustomWorkplaceAccessDataQuery): Paginated<CustomWorkplaceAccessData>
-    /**
-     * 获取定制工作台小组件访问数据
-     * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/workplace_block_access_data/search
-     */
-    searchWorkplaceWorkplaceBlockAccessData(query?: SearchWorkplaceWorkplaceBlockAccessDataQuery): Paginated<BlockAccessData>
+    workplace: Workplace.Methods
   }
 }
 
-export interface SearchWorkplaceWorkplaceAccessDataQuery extends Pagination {
-  /** 数据检索开始时间，精确到日。格式yyyy-MM-dd */
-  from_date: string
-  /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
-  to_date: string
-}
+export namespace Workplace {
+  export interface Methods {
+    workplaceAccessData: WorkplaceAccessData.Methods
+    customWorkplaceAccessData: CustomWorkplaceAccessData.Methods
+    workplaceBlockAccessData: WorkplaceBlockAccessData.Methods
+  }
 
-export interface SearchWorkplaceCustomWorkplaceAccessDataQuery extends Pagination {
-  /** 数据检索开始时间，精确到日。格式yyyy-MM-dd */
-  from_date: string
-  /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
-  to_date: string
-  /** 定制化工作台id.非必填,不填的时候,返回所有定制化工作台数据。 */
-  custom_workplace_id?: string
-}
+  export namespace WorkplaceAccessData {
+    export interface Methods {
+      /**
+       * 获取工作台访问数据
+       * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/workplace_access_data/search
+       */
+      search(query?: SearchQuery): Paginated<Lark.WorkplaceAccessData>
+    }
+
+    export interface SearchQuery extends Pagination {
+      /** 数据检索开始时间，精确到日。格式yyyy-MM-dd */
+      from_date: string
+      /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
+      to_date: string
+    }
+  }
 
-export interface SearchWorkplaceWorkplaceBlockAccessDataQuery extends Pagination {
-  /** 数据检索开始时间，精确到日。格式yyyy-MM-dd。 */
-  from_date: string
-  /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
-  to_date: string
-  /** 小组件id */
-  block_id?: string
+  export namespace CustomWorkplaceAccessData {
+    export interface Methods {
+      /**
+       * 获取定制工作台访问数据
+       * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/custom_workplace_access_data/search
+       */
+      search(query?: SearchQuery): Paginated<Lark.CustomWorkplaceAccessData>
+    }
+
+    export interface SearchQuery extends Pagination {
+      /** 数据检索开始时间，精确到日。格式yyyy-MM-dd */
+      from_date: string
+      /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
+      to_date: string
+      /** 定制化工作台id.非必填,不填的时候,返回所有定制化工作台数据。 */
+      custom_workplace_id?: string
+    }
+  }
+
+  export namespace WorkplaceBlockAccessData {
+    export interface Methods {
+      /**
+       * 获取定制工作台小组件访问数据
+       * @see https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/workplace-v1/workplace_block_access_data/search
+       */
+      search(query?: SearchQuery): Paginated<Lark.BlockAccessData>
+    }
+
+    export interface SearchQuery extends Pagination {
+      /** 数据检索开始时间，精确到日。格式yyyy-MM-dd。 */
+      from_date: string
+      /** 数据检索结束时间，精确到日。格式yyyy-MM-dd。 */
+      to_date: string
+      /** 小组件id */
+      block_id?: string
+    }
+  }
 }
 
 Internal.define({
   '/workplace/v1/workplace_access_data/search': {
-    POST: { name: 'searchWorkplaceWorkplaceAccessData', pagination: { argIndex: 0 } },
+    POST: { name: 'workplace.workplaceAccessData.search', pagination: { argIndex: 0 } },
   },
   '/workplace/v1/custom_workplace_access_data/search': {
-    POST: { name: 'searchWorkplaceCustomWorkplaceAccessData', pagination: { argIndex: 0 } },
+    POST: { name: 'workplace.customWorkplaceAccessData.search', pagination: { argIndex: 0 } },
   },
   '/workplace/v1/workplace_block_access_data/search': {
-    POST: { name: 'searchWorkplaceWorkplaceBlockAccessData', pagination: { argIndex: 0 } },
+    POST: { name: 'workplace.workplaceBlockAccessData.search', pagination: { argIndex: 0 } },
   },
 })

package/src/utils.ts

@@ -1,8 +1,9 @@
 import crypto from 'crypto'
 import { Context, h, pick, Session, Universal } from '@satorijs/core'
 import { LarkBot } from './bot'
-import { GetImChatResponse, ListChat, Message, User } from './types'
+import { Im, ListChat, Message, User } from './types'
 import { MessageContent } from './content'
+import { hyphenate } from 'cosmokit'
 
 export interface EventHeader<K extends keyof Events> {
   event_id: string
@@ -291,11 +292,11 @@ export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: Eve
         }
         for (const [key, value] of Object.entries(options)) {
           if (value === true) {
-            content += ` --${key} 1`
+            content += ` --${hyphenate(key)} 1`
           } else if (value === false) {
-            content += ` --${key} 0`
+            content += ` --${hyphenate(key)} 0`
           } else {
-            content += ` --${key} ${toArg(value)}`
+            content += ` --${hyphenate(key)} ${toArg(value)}`
           }
         }
         if (body.event.action.input_value) {
@@ -306,7 +307,7 @@ export async function adaptSession<C extends Context>(bot: LarkBot<C>, body: Eve
         session.channelId = body.event.context.open_chat_id
         session.guildId = body.event.context.open_chat_id
         session.userId = body.event.operator.open_id
-        const chat = await bot.internal.getImChat(session.channelId)
+        const chat = await bot.internal.im.chat.get(session.channelId)
         // TODO: add channel data
         session.isDirect = chat.chat_mode === 'p2p'
       }
@@ -387,7 +388,7 @@ export function extractIdType(id: string): ReceiveIdType {
   return 'user_id'
 }
 
-export function decodeChannel(channelId: string, guild: GetImChatResponse): Universal.Channel {
+export function decodeChannel(channelId: string, guild: Im.Chat.GetResponse): Universal.Channel {
   return {
     id: channelId,
     type: Universal.Channel.Type.TEXT,