fix(discord): embed typing

koishijs · Mar 18, 2021 · 7da0784 · 7da0784
1 parent a976035
commit 7da0784
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/adapter-discord/src/bot.ts b/packages/adapter-discord/src/bot.ts
@@ -106,7 +106,7 @@ export class DiscordBot extends Bot<'discord'> {
           })
           sentMessageId = r.id
         }
-        if (type === 'image' || type === 'video') {
+        if (type === 'image' || type === 'video' && data.url) {
           if (data.url.startsWith('http://') || data.url.startsWith('https://')) {
             const a = await axios({
               url: data.url,

diff --git a/packages/adapter-discord/src/index.ts b/packages/adapter-discord/src/index.ts
@@ -2,6 +2,7 @@ import { Adapter } from 'koishi-core'
 import { AxiosRequestConfig } from 'axios'
 import { DiscordBot } from './bot'
 import WsClient from './ws'
+import { Embed } from './types'
 
 export * from './bot'
 export * as dc from './types'
@@ -15,6 +16,12 @@ declare module 'koishi-core' {
     discord?: DiscordOptions
   }
 
+  interface Session {
+    discord?: {
+      embeds: Embed[]
+    }
+  }
+
   namespace Bot {
     interface Platforms {
       discord: DiscordBot

diff --git a/packages/adapter-discord/src/utils.ts b/packages/adapter-discord/src/utils.ts
@@ -28,7 +28,7 @@ export const adaptAuthor = (author: DC.Author): AuthorInfo => ({
   nickname: author.username,
 })
 
-export async function adaptMessage(bot: DiscordBot, meta: DC.DiscordMessage, session: MessageInfo = {}) {
+export async function adaptMessage(bot: DiscordBot, meta: DC.DiscordMessage, session: Partial<Session.Payload<Session.MessageAction>> = {}) {
   if (meta.author) {
     session.author = adaptAuthor(meta.author)
     session.userId = meta.author.id
@@ -90,7 +90,9 @@ export async function adaptMessage(bot: DiscordBot, meta: DC.DiscordMessage, ses
       session.content += segment('video', { url: embed.video.url, proxy_url: embed.video.proxy_url })
     }
   }
-  session.content = meta.embeds.map(v => segment('embed', { data: JSON.stringify(v) })).join('') + session.content
+  session.discord = {
+    embeds: meta.embeds
+  }
   return session
 }