From b63018849e3819b00a575e902e9c6cbbfcbc9988 Mon Sep 17 00:00:00 2001 From: yeyang <746659424@qq.com> Date: Sat, 12 Nov 2022 00:25:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9setu.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/set.js | 2 +- config/setu/.gitignore | 1 + config/setu/.keep | 0 model/setu.js | 13 +++++++++---- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 config/setu/.gitignore delete mode 100644 config/setu/.keep diff --git a/apps/set.js b/apps/set.js index b0d2d94..692b9a7 100644 --- a/apps/set.js +++ b/apps/set.js @@ -163,7 +163,7 @@ export class NewConfig extends plugin { .then(() => e.reply("✅ 已经切换代理为2")) .catch(err => console.log(err)) } else if (/3/.test(e.msg)) { - await redis.set(rediskey, "i.pixiv.cat") + await redis.set(rediskey, "px2.rainchan.win") .then(() => e.reply("✅ 已经切换代理为3")) .catch(err => console.log(err)) } else if (/4/.test(e.msg)) { diff --git a/config/setu/.gitignore b/config/setu/.gitignore new file mode 100644 index 0000000..94a2dd1 --- /dev/null +++ b/config/setu/.gitignore @@ -0,0 +1 @@ +*.json \ No newline at end of file diff --git a/config/setu/.keep b/config/setu/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/model/setu.js b/model/setu.js index 5f58265..0abe21a 100644 --- a/model/setu.js +++ b/model/setu.js @@ -43,6 +43,7 @@ export default new class setu { this.path = "./plugins/yenai-plugin/config/setu/setu.json" //私聊配置 this.path_s = "./plugins/yenai-plugin/config/setu/setu_s.json" + this.apicfg = "./plugins/yenai-plugin/config/setu/api.json" //默认配置 this.def = { r18: 0, @@ -68,14 +69,18 @@ export default new class setu { * @return {Object} */ async setuapi(r18, num = 1, tag = "") { - const api = "https://api.lolicon.app/setu/v2"; + let api = "https://api.lolicon.app/setu/v2"; + if (fs.existsSync(this.apicfg)) { + let apicfg = await Cfg.getread(this.apicfg) + if (apicfg.api) api = apicfg.api + } let size = "original" let proxy = await redis.get(`yenai:proxy`) if (num > 6) { size = "regular" } let url = `${api}?r18=${r18}&num=${num}${tag}&proxy=${proxy}&size=${size}`; - + console.log(url); let result = await fetch(url).then(res => res.json()).catch(err => console.log(err)) if (!result) return false; return result.data @@ -248,7 +253,7 @@ export default new class setu { * @param {*} e oicq * @param {String} qq 设置的qq * @param {String} cd 设置的cd - */ + */ async setcd(e, qq, cd) { let res = {}; if (fs.existsSync(this.path_s)) { @@ -269,7 +274,7 @@ export default new class setu { * @param {*} e oicq * @param {Boolean} yes 开启或关闭 * @param {Boolean} group 设置群聊还是私聊 - */ + */ async setr18(e, yes, group) { let res = {}; if (group) {