fix: undefined url in base64 or assets transform (#186)

* fix: should pass url instead of image * fix: change transform functions accept url
koishijs · Mar 21, 2024 · d29401c · d29401c
1 parent ddcf3c4
commit d29401c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/core/src/command.tsx b/packages/core/src/command.tsx
@@ -93,13 +93,13 @@ export function apply(ctx: Context, config: Config) {
         }
 
         if (config.asset && ctx.assets) {
-          url = await ctx.booru.imgUrlToAssetUrl(image)
+          url = await ctx.booru.imgUrlToAssetUrl(url)
           if (!url) {
             output.unshift(<i18n path='.no-image'></i18n>)
             continue
           }
         } else if (config.base64) {
-          url = await ctx.booru.imgUrlToBase64(image)
+          url = await ctx.booru.imgUrlToBase64(url)
           if (!url) {
             output.unshift(<i18n path='.no-image'></i18n>)
             continue

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -84,16 +84,16 @@ class ImageService extends Service {
     return undefined
   }
 
-  async imgUrlToAssetUrl(image: ImageSource.Result): Promise<string> {
-    return await this.ctx.assets.upload(image.url, Date.now().toString()).catch(() => {
+  async imgUrlToAssetUrl(url: string): Promise<string> {
+    return await this.ctx.assets.upload(url, Date.now().toString()).catch(() => {
       logger.warn('Request failed when trying to store image with assets service.')
       return null
     })
   }
 
-  async imgUrlToBase64(image: ImageSource.Result): Promise<string> {
+  async imgUrlToBase64(url: string): Promise<string> {
     return this.ctx
-      .http(image.url, { method: 'GET', responseType: 'arraybuffer' })
+      .http(url, { method: 'GET', responseType: 'arraybuffer' })
       .then((resp) => {
         return `data:${resp.headers['content-type']};base64,${Buffer.from(resp.data).toString('base64')}`
       })