Merge pull request #1 from koishijs/main

[pull] main from koishijs:main
CyanForks · Feb 24, 2024 · fe882b1 · fe882b1
2 parents b7f1fe9 + c75371a
commit fe882b1
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 47 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,24 +7,9 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Node
-        uses: actions/setup-node@v4
-      - name: Install
-        run: yarn
-
-      - name: Build
-        run: yarn build
-
-      - name: Set npm token
-        run: |
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-
-      - name: Publish packages
-        run: yarn pub
+    uses: cordiverse/workflows/.github/workflows/publish.yml@main
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   deploy:
     runs-on: ubuntu-latest

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-booru",
   "description": "Image service for Koishi",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -44,11 +44,11 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   },
   "devDependencies": {
     "@koishijs/assets": "^1.0.2",
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   },
   "dependencies": {
     "languagedetect": "^2.0.0"

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -22,7 +22,7 @@ class ImageService extends Service {
   private sources: ImageSource[] = []
   private languageDetect = new LanguageDetect()
 
-  constructor(ctx: Context, private config: Config) {
+  constructor(ctx: Context, config: Config) {
     super(ctx, 'booru', true)
     this.config = config
   }
@@ -63,8 +63,8 @@ class ImageService extends Service {
     for (const source of sources) {
       const tags = source.tokenize(query.query)
       const images = await source.get({ count: query.count, tags, raw: query.query }).catch((err) => {
-        if (Quester.isAxiosError(err)) {
-          logger.warn(`source ${source.config.label} request failed ${err.status ? `with code ${err.status} ${JSON.stringify(err.response?.data)}` : ''}`)
+        if (Quester.Error.is(err)) {
+          logger.warn(`source ${source.config.label} request failed ${err.response?.status ? `with code ${err.response?.status} ${JSON.stringify(err.response?.data)}` : ''}`)
         } else {
           logger.error(`source ${source.config.label} unknown error: ${err.message}`)
         }
@@ -91,8 +91,8 @@ class ImageService extends Service {
     return this.ctx.http.axios(image.url, { method: 'GET', responseType: 'arraybuffer' }).then(resp => {
       return `data:${resp.headers['content-type']};base64,${Buffer.from(resp.data, 'binary').toString('base64')}`
     }).catch(err => {
-      if (Quester.isAxiosError(err)) {
-        logger.warn(`Request images failed with HTTP status ${err.status}: ${JSON.stringify(err.response?.data)}.`)
+      if (Quester.Error.is(err)) {
+        logger.warn(`Request images failed with HTTP status ${err.response?.status}: ${JSON.stringify(err.response?.data)}.`)
       } else {
         logger.error(`Request images failed with unknown error: ${err.message}.`)
       }

diff --git a/packages/danbooru/package.json b/packages/danbooru/package.json
@@ -45,10 +45,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/e621/package.json b/packages/e621/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/gelbooru/package.json b/packages/gelbooru/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/konachan/package.json b/packages/konachan/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/local/package.json b/packages/local/package.json
@@ -48,7 +48,7 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   }
 }
diff --git a/packages/lolibooru/package.json b/packages/lolibooru/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/lolicon/package.json b/packages/lolicon/package.json
@@ -45,10 +45,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/pixiv/package.json b/packages/pixiv/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/safebooru/package.json b/packages/safebooru/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/sankaku/package.json b/packages/sankaku/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }
diff --git a/packages/yande/package.json b/packages/yande/package.json
@@ -46,10 +46,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.15.2",
+    "koishi": "^4.17.0",
     "koishi-plugin-booru": "^1.1.0"
   },
   "devDependencies": {
-    "koishi": "^4.15.2"
+    "koishi": "^4.17.0"
   }
 }