diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index e3bef56f5..da065a4ac 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,4 +1,4 @@ -import { Computed, Context, Logger, Quester, Schema, Service, remove } from 'koishi' +import { Computed, Context, Logger, HTTP, Schema, Service, remove } from 'koishi' import LanguageDetect from 'languagedetect' import * as Command from './command' @@ -67,7 +67,7 @@ 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.Error.is(err)) { + if (HTTP.Error.is(err)) { logger.warn( [ `source ${source.config.label} request failed`, @@ -102,7 +102,7 @@ class ImageService extends Service { const resp = await this.ctx .http(url, { method: 'GET', responseType: 'arraybuffer', proxyAgent: '' }) .catch((err) => { - if (Quester.Error.is(err)) { + if (HTTP.Error.is(err)) { logger.warn( `Request images failed with HTTP status ${err.response?.status}: ${JSON.stringify(err.response?.data)}.`, ) @@ -158,7 +158,7 @@ class ImageService extends Service { return `data:${resp.headers['content-type']};base64,${Buffer.from(resp.data).toString('base64')}` }) .catch((err) => { - if (Quester.Error.is(err)) { + if (HTTP.Error.is(err)) { logger.warn( `Request images failed with HTTP status ${err.response?.status}: ${JSON.stringify(err.response?.data)}.`, ) diff --git a/packages/core/src/source.ts b/packages/core/src/source.ts index 132f5f18b..29dc2ec9d 100644 --- a/packages/core/src/source.ts +++ b/packages/core/src/source.ts @@ -1,4 +1,4 @@ -import { Context, Element, Quester, Schema } from 'koishi' +import { Context, Element, HTTP, Schema } from 'koishi' import type {} from '@cordisjs/plugin-proxy-agent' @@ -8,7 +8,7 @@ export abstract class ImageSource { }), ) } catch (err) { - if (Quester.Error.is(err)) { + if (HTTP.Error.is(err)) { throw new Error('get pixiv image failed: ' + `${err.message} (${err.response?.status})`) } else { throw new Error('get pixiv image failed: ' + err) @@ -180,7 +180,7 @@ class PixivImageSource extends ImageSource { return this.accessToken } catch (err) { - if (Quester.Error.is(err)) { + if (HTTP.Error.is(err)) { throw new Error('Login failed with status code ' + err.response?.status + '\n' + JSON.stringify(err.response)) } else { throw new Error('Login failed with unknown error: ' + err.message)