fix: fix resource element impl

koishijs · Jan 16, 2024 · 535689d · 535689d
1 parent 2d86b1f
commit 535689d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-adapter-onebot",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "OneBot Adapter for Koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -52,12 +52,12 @@
     "esbuild": "^0.18.20",
     "esbuild-register": "^3.5.0",
     "eslint": "^8.55.0",
-    "koishi": "^4.16.1",
+    "koishi": "^4.16.4",
     "typescript": "^5.3.2",
     "yml-register": "^1.1.0"
   },
   "peerDependencies": {
-    "koishi": "^4.16.1"
+    "koishi": "^4.16.4"
   },
   "dependencies": {
     "qface": "^1.4.1"

diff --git a/src/bot/base.ts b/src/bot/base.ts
@@ -4,6 +4,7 @@ import { OneBotMessageEncoder } from './message'
 
 export class BaseBot<C extends Context = Context, T extends BaseBot.Config = BaseBot.Config> extends Bot<C, T> {
   static MessageEncoder = OneBotMessageEncoder
+  static inject = ['http']
 
   public parent?: BaseBot
   public internal: OneBot.Internal

diff --git a/src/bot/message.ts b/src/bot/message.ts
@@ -131,10 +131,12 @@ export class OneBotMessageEncoder<C extends Context = Context> extends MessageEn
     } else if (type === 'a') {
       await this.render(children)
       if (attrs.href) this.text(` (${attrs.href}) `)
-    } else if (['video', 'audio', 'image'].includes(type)) {
+    } else if (['video', 'audio', 'image', 'img'].includes(type)) {
       if (type === 'audio') type = 'record'
+      if (type === 'img') type = 'image'
       attrs = { ...attrs }
-      attrs.file = attrs.url
+      attrs.file = attrs.src || attrs.url
+      delete attrs.src
       delete attrs.url
       if (attrs.cache) {
         attrs.cache = 1

diff --git a/src/utils.ts b/src/utils.ts
@@ -74,8 +74,29 @@ export async function adaptMessage(
         h.image(qface.getUrl(id)),
       ])
     },
+    image(attrs) {
+      return h('img', {
+        src: attrs.url || attrs.file,
+        ...attrs,
+      })
+    },
     record(attrs) {
-      return h('audio', attrs)
+      return h('audio', {
+        src: attrs.url || attrs.file,
+        ...attrs,
+      })
+    },
+    video(attrs) {
+      return h('video', {
+        src: attrs.url || attrs.file,
+        ...attrs,
+      })
+    },
+    file(attrs) {
+      return h('file', {
+        src: attrs.url || attrs.file,
+        ...attrs,
+      })
     },
   })
   const [guildId, channelId] = decodeGuildChannelId(data)