diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/enhancement.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/feature.yml rename to .github/ISSUE_TEMPLATE/enhancement.yml diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml new file mode 100644 index 0000000..3dd5ad1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -0,0 +1,16 @@ +name: 其他问题及意见反馈 +description: 插件使用上的问题反馈、功能失效等。 +title: "[问题反馈]: " +labels: ["question"] +body: + - type: input + attributes: + label: 反馈内容 + description: 请简要描述您需要反馈的内容。 + validations: + required: true + + - type: textarea + attributes: + label: 其他说明 + description: 如果您有任何其他信息或补充说明,请在这里添加。 diff --git a/config/default_config/bika.yaml b/config/default_config/bika.yaml index 279956a..1432bef 100644 --- a/config/default_config/bika.yaml +++ b/config/default_config/bika.yaml @@ -8,3 +8,9 @@ bikaDirectConnection: false bikaImageProxy: s3.go2778.com/static #哔咔图片质量,可选值 ['low', 'medium', 'high', 'original'] 质量依次从低到高 imageQuality: medium +#使用的hibiapi地址https://github.com/mixmoe/HibiAPI +hibiAPI: https://hibiapi.dengfenglai.icu +#哔咔搜索排序方式:dd(最新发布)、da(最早发布)、ld(最多喜欢)、vd(最多浏览) +searchSort: ld +#隐藏哔咔搜索简略图 +hideSearchImg: false diff --git a/guoba.support.js b/guoba.support.js index ae8088f..ba14045 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -35,7 +35,7 @@ export function supportGuoba() { // 配置项 schemas schemas: [ { - component: "whole.Divider", + component: "Divider", label: "消息通知" }, { diff --git a/lib/request/request.js b/lib/request/request.js index 171a719..5487fa4 100644 --- a/lib/request/request.js +++ b/lib/request/request.js @@ -188,10 +188,15 @@ export default new class { */ async proxyRequestImg(url, { cache, timeout, headers } = {}) { if (!this.getAgent()) return segment.image(url, cache, timeout, headers) + const start = Date.now() let Request = await this.get(url, { - headers + headers, + responseType: "buffer" }).catch(err => logger.error(err)) - return segment.image(Request?.body ?? `${Plugin_Path}/resources/img/imgerror.png`, cache, timeout) + const kb = Request ? logger.magenta((Request?.length / 1024).toFixed(2) + "kb") : logger.red("error") + const ms = logger.green(Date.now() - start + "ms") + logger.debug(`[Yenai-Plugin][proxyRequestImg][${_.truncate(url)}] ${kb} ${ms}`) + return segment.image(Request ?? `${Plugin_Path}/resources/img/imgerror.png`, cache, timeout) } _prepareRequest(options) { diff --git a/model/Bika.js b/model/Bika.js index 21df5dc..2e889c3 100644 --- a/model/Bika.js +++ b/model/Bika.js @@ -4,7 +4,7 @@ import { Config } from "../components/index.js" export default new (class { constructor() { - this.domain = "https://api.obfs.dev/api/bika" + this.domain = `${Config.bika.hibiAPI}/api/bika` this.hearder = { headers: { "x-image-quality": Config.bika.imageQuality @@ -28,6 +28,7 @@ export default new (class { * @returns {Array} 返回搜索结果信息数组 */ async search(keyword, page = 1, type = "advanced", sort = "ld") { + sort = Config.bika.searchSort || sort let types = [ { alias: [ "关键词", "advanced", "高级" ], @@ -60,14 +61,14 @@ export default new (class { let { title, tags, categories, author, description = "未知", likesCount, thumb, _id, finished } = item msg.push(_id) msg.push([ - `${index + 1}、${title}\n`, - `作者:${author}\n`, - `描述:${_.truncate(description)}\n`, - `分类:${categories.join(",")}\n`, - `喜欢:${likesCount}\n`, - `完结:${finished}\n`, - tags ? `tag:${_.truncate(tags.join(","))}\n` : "", - await this._requestBikaImg(thumb.fileServer, thumb.path) + `${index + 1}、${title}\n`, + `作者:${author}\n`, + `描述:${_.truncate(description)}\n`, + `分类:${categories.join(",")}\n`, + `喜欢:${likesCount}\n`, + `完结:${finished}\n`, + tags ? `tag:${_.truncate(tags.join(","))}\n` : "", + Config.bika.hideSearchImg ? "" : await this._requestBikaImg(thumb.fileServer, thumb.path) ]) } return msg