feat(satori): add guildId as 3rd param for sendPrivateMessage

satorijs · Oct 14, 2023 · 6ae3b0d · 6ae3b0d
1 parent 49222c6
commit 6ae3b0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/packages/core/src/bot.ts b/packages/core/src/bot.ts
@@ -156,8 +156,8 @@ export abstract class Bot<T = any> implements Login {
     return messages.map(message => message.id)
   }
 
-  async sendPrivateMessage(userId: string, content: Fragment, options?: SendOptions) {
-    const { id } = await this.createDirectChannel(userId, options?.session?.guildId)
+  async sendPrivateMessage(userId: string, content: Fragment, guildId?: string, options?: SendOptions) {
+    const { id } = await this.createDirectChannel(userId, guildId ?? options?.session?.guildId)
     return this.sendMessage(id, content, null, options)
   }
 

diff --git a/packages/protocol/src/index.ts b/packages/protocol/src/index.ts
@@ -75,7 +75,7 @@ export interface List<T> {
 export interface Methods {
   // message
   sendMessage(channelId: string, content: Element.Fragment, guildId?: string, options?: SendOptions): Promise<string[]>
-  sendPrivateMessage(userId: string, content: Element.Fragment, options?: SendOptions): Promise<string[]>
+  sendPrivateMessage(userId: string, content: Element.Fragment, guildId?: string, options?: SendOptions): Promise<string[]>
   getMessage(channelId: string, messageId: string): Promise<Message>
   getMessageList(channelId: string, next?: string): Promise<List<Message>>
   getMessageIter(channelId: string): AsyncIterable<Message>
@@ -228,22 +228,14 @@ export interface Button {
 
 export interface Command {
   name: string
-  aliases: string[]
   description: Dict<string>
-  arguments: Command.Argument[]
-  options: Command.Option[]
+  arguments: Command.Declaration[]
+  options: Command.Declaration[]
   children: Command[]
 }
 
 export namespace Command {
-  export interface Argument {
-    name: string
-    description: Dict<string>
-    type: string
-    required: boolean
-  }
-
-  export interface Option {
+  export interface Declaration {
     name: string
     description: Dict<string>
     type: string