@satorijs/adapter-discord 4.3.1 → 4.5.0

package/src/message.ts

@@ -1,4 +1,4 @@
-import { Context, Dict, h, MessageEncoder, Quester, Schema, Universal } from '@satorijs/satori'
+import { Context, Dict, h, MessageEncoder, Schema, Universal } from '@satorijs/core'
 import { DiscordBot } from './bot'
 import { ActionRow, Button, ButtonStyles, Channel, ComponentType, Message } from './types'
 import { decodeMessage, sanitize } from './utils'
@@ -70,7 +70,7 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
 
       return message
     } catch (e) {
-      if (Quester.Error.is(e) && e.response) {
+      if (this.bot.http.isError(e) && e.response) {
         if (e.response.data?.code === 10015) {
           this.bot.logger.debug('webhook has been deleted, recreating..., %o', e.response.data)
           if (!this.bot.webhookLock[this.channelId]) this.bot.webhooks[this.channelId] = null
@@ -88,7 +88,8 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
     const { filename, data, mime } = await this.bot.ctx.http.file(attrs.src || attrs.url, attrs)
     const form = new FormData()
     const value = new Blob([data], { type: mime })
-    form.append('file', value, attrs.file || filename)
+    // https://discord.com/developers/docs/reference#uploading-files
+    form.append('files[0]', value, attrs.file || filename)
     form.append('payload_json', JSON.stringify(payload))
     return this.post(form)
   }
@@ -300,7 +301,15 @@ export class DiscordMessageEncoder<C extends Context = Context> extends MessageE
     } else if (type === 'audio') {
       await this.sendAsset('file', attrs, {
         ...this.addition,
-        content: this.buffer.trim(),
+        content: '',
+        attachments: [
+          {
+            waveform: '', // base64 encoded bytearray representing a sampled waveform
+            id: 0,
+            duration_secs: attrs.duration ?? 0,
+          },
+        ],
+        flags: Message.Flag.IS_VOICE_MESSAGE,
       })
       this.buffer = ''
     } else if (type === 'author') {

package/src/types/internal.ts

@@ -1,13 +1,13 @@
-import { Dict, makeArray, Quester } from '@satorijs/satori'
+import { Dict, HTTP, makeArray } from '@satorijs/core'
 import { DiscordBot } from '../bot'
 
 export class Internal {
   constructor(private bot: DiscordBot) {}
 
-  static define(routes: Dict<Partial<Record<Quester.Method, string | string[]>>>) {
+  static define(routes: Dict<Partial<Record<HTTP.Method, string | string[]>>>) {
     for (const path in routes) {
       for (const key in routes[path]) {
-        const method = key as Quester.Method
+        const method = key as HTTP.Method
         for (const name of makeArray(routes[path][method])) {
           Internal.prototype[name] = async function (this: Internal, ...args: any[]) {
             const raw = args.join(', ')
@@ -15,7 +15,7 @@ export class Internal {
               if (!args.length) throw new Error(`too few arguments for ${path}, received ${raw}`)
               return args.shift()
             })
-            const config: Quester.RequestConfig = {}
+            const config: HTTP.RequestConfig = {}
             if (args.length === 1) {
               if (method === 'GET' || method === 'DELETE') {
                 config.params = args[0]
@@ -32,7 +32,7 @@ export class Internal {
               this.bot.logger.debug(`${method} ${url}`, config)
               return (await this.bot.http(method, url, config)).data
             } catch (error) {
-              if (!Quester.Error.is(error) || !error.response) throw error
+              if (!this.bot.http.isError(error) || !error.response) throw error
               throw new Error(`[${error.response.status}] ${JSON.stringify(error.response.data)}`)
             }
           }

package/src/types/message.ts

@@ -134,6 +134,10 @@ export namespace Message {
     LOADING = 1 << 7,
     /** this message failed to mention some roles and add their members to the thread */
     FAILED_TO_MENTION_SOME_ROLES_IN_THREAD = 1 << 8,
+    /** this message will not trigger push and desktop notifications */
+    SUPPRESS_NOTIFICATIONS = 1 << 12,
+    /** this message is a voice message */
+    IS_VOICE_MESSAGE = 1 << 13,
   }
 
   /** https://discord.com/developers/docs/resources/channel#message-reference-object-message-reference-structure */

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { Context, Dict, h, pick, Session, Universal, valueMap } from '@satorijs/satori'
+import { Context, Dict, h, pick, Session, Universal, valueMap } from '@satorijs/core'
 import { DiscordBot } from './bot'
 import * as Discord from './types'
 

package/src/ws.ts

@@ -1,4 +1,4 @@
-import { Adapter, Context, Schema } from '@satorijs/satori'
+import { Adapter, Context, Schema } from '@satorijs/core'
 import { Gateway } from './types'
 import { adaptSession, decodeUser } from './utils'
 import { DiscordBot } from './bot'