From 1e06d1efb899f6817f330f03ffebd4cb9503defa Mon Sep 17 00:00:00 2001 From: yeyang <746659424@qq.com> Date: Tue, 20 Dec 2022 13:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=91=86=E7=83=82ing~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fun.js | 17 +++++--- apps/gp_admin.js | 109 ++++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 60 deletions(-) diff --git a/apps/fun.js b/apps/fun.js index ebdea91..ffb4565 100644 --- a/apps/fun.js +++ b/apps/fun.js @@ -77,8 +77,8 @@ export class example extends plugin { /**随机唱鸭 */ async Sing(e) { - let url = "https://xiaobai.klizi.cn/API/music/changya.php" - let urls = "https://ovooa.com/API/changya/" + let urls = "https://xiaobai.klizi.cn/API/music/changya.php" + let url = "https://ovooa.com/API/changya/" let res = await fetch(url).then(res => res.json()).catch(err => console.log(err)) //备用接口 if (!res) { @@ -128,7 +128,8 @@ export class example extends plugin { } msg = msg.replace(/#|翻译/g, "").trim() if (!msg) return; - let results = await fetch(`https://xiaobai.klizi.cn/API/other/trans.php?data=&msg=${msg}`).then(res => res.text()).catch(err => console.log(err)) + // let results = await fetch(`https://xiaobai.klizi.cn/API/other/trans.php?data=&msg=${msg}`).then(res => res.text()).catch(err => console.log(err)) + let results = await fetch(`https://xiaobapi.top/api/xb/api/trans.php?msg=${msg}`).then(res => res.text()).catch(err => console.log(err)) if (!results) return e.reply("接口失效辣(๑ŐдŐ)b") e.reply(results) @@ -142,15 +143,19 @@ export class example extends plugin { if (!isFriend && !Config.Notice.Strangers_love) return e.reply("不加好友不点🙄", true) /** 点赞成功回复的图片*/ let imgs = [ - "https://xiaobai.klizi.cn/API/ce/zan.php?qq=", - "https://xiaobai.klizi.cn/API/ce/xin.php?qq=", + // "https://xiaobai.klizi.cn/API/ce/zan.php?qq=", + "https://xiaobapi.top/api/xb/api/bixin.php?qq=", + // "https://xiaobai.klizi.cn/API/ce/xin.php?qq=", + "https://xiaobapi.top/api/xb/api/bixinxin.php?qq=", + "https://xiaobapi.top/api/xb/api/zan_2.php?qq=" ] /** 一个随机数 */ let random = Math.floor(Math.random() * (imgs.length - 0)) let success_img = segment.image(imgs[random] + e.user_id) /** 点赞失败的图片 */ - let failds_img = segment.image(`https://xiaobai.klizi.cn/API/ce/paa.php?qq=${e.user_id}`) + // let failds_img = segment.image(`https://xiaobai.klizi.cn/API/ce/paa.php?qq=${e.user_id}`) + let failds_img = segment.image(`https://xiaobapi.top/api/xb/api/pa.php?qq=${e.user_id}`) /** 执行点赞*/ let n = 0; diff --git a/apps/gp_admin.js b/apps/gp_admin.js index 5f3137d..b743eb9 100644 --- a/apps/gp_admin.js +++ b/apps/gp_admin.js @@ -133,22 +133,22 @@ export class Basics extends plugin { cron: '0 0/1 * * * ?', name: '定时禁言', fnc: () => this.timeTaboo(), - } + } } - /**定时群禁言 */ - async timeTaboo () { + /**定时群禁言 */ + async timeTaboo() { let time = moment(new Date()).format('HH:mm') let task = await redis.keys('Yunzai:yenai:Taboo:*') - if (!task) return + if (!task.length) return for (let i of task) { - let data = JSON.parse(await redis.get(i)) - if (data.muteTime == time) { - await Bot.pickGroup(data.groupNumber).muteAll(true) - } else if (data.remTime == time) { - await Bot.pickGroup(data.groupNumber).muteAll(false) - } - } - } + let data = JSON.parse(await redis.get(i)) + if (data.muteTime == time) { + await Bot.pickGroup(data.groupNumber).muteAll(true) + } else if (data.remTime == time) { + await Bot.pickGroup(data.groupNumber).muteAll(false) + } + } + } /**禁言 */ async Taboo(e) { @@ -702,53 +702,54 @@ export class Basics extends plugin { return e.reply("做不到，怎么想我都做不到吧ヽ(≧Д≦)ノ", true); } let ck = Cfg.getck("qun.qq.com") - let url = `http://xiaobai.klizi.cn/API/qqgn/SpeakRank.php?uin=${Bot.uin}&skey=${ck.skey}&pskey=${ck.p_skey}&group=${e.group_id}&type=${/(7|七)天/.test(e.msg) ? 1 : 0}` + // let url = `http://xiaobai.klizi.cn/API/qqgn/SpeakRank.php?uin=${Bot.uin}&skey=${ck.skey}&pskey=${ck.p_skey}&group=${e.group_id}&type=${/(7|七)天/.test(e.msg) ? 1 : 0}` + let url = `http://ovooa.com/API/qunhy/api?QQ=${Bot.uin}&Skey=${ck.skey}&Pskey=${ck.p_skey}&Group=${e.group_id}&type=text` let res = await fetch(url).then(res => res.text()).catch(err => console.log(err)) if (!res) return e.reply("接口失效辣！！！") await e.reply(res) } - + //设置定时群禁言 async timeMute(e) { - if (!e.isMaster) return false - if (/任务/.test(e.msg)) { - let task = await redis.keys('Yunzai:yenai:Taboo:*') - if (!task.length) return e.reply('目前还没有定时禁言任务') - let msglist = [`目前定时禁言任务有${task.length}个`] - for (let i = 0; i < task.length; i++) { - let data = JSON.parse(await redis.get(task[i])) - msglist.push(`${i+1}.\n群号:${data.groupNumber}\n禁言时间:${data.muteTime}\n解禁时间:${data.remTime}`) - } - Cfg.getforwardMsg(e,msglist) - return true - } - if (/取消/.test(e.msg)) { - let data = JSON.parse(await redis.get(`Yunzai:yenai:Taboo:${e.group_id}`)) - if (!data) return e.reply('这群目前没有定时禁言任务') - await redis.del(`Yunzai:yenai:Taboo:${e.group_id}`) - e.reply('此群定时禁言任务删除成功') - return true - } - if (!e.group.is_admin && !e.group.is_owner) { - return e.reply("做不到，怎么想我都做不到吧ヽ(≧Д≦)ノ", true); - } - try{ - var muteTime = e.msg.match(/禁言(\d+):(\d+)/)[0].replace(/禁言/g, '') - var remTime = e.msg.match(/解禁(\d+):(\d+)/)[0].replace(/解禁/g, '') - if (muteTime.length != 5 || remTime.length != 5 ) return e.reply('格式不对\n示范：#定时禁言00:00，解禁08:00') - } catch(err) { - logger.error(err) - e.reply('格式不对\n示范：#定时禁言00:00，解禁08:00') - return - } - - if (muteTime == remTime) return e.reply('没事就吃溜溜梅') - let data = { - groupNumber: e.group_id, - muteTime, - remTime - } - await redis.set(`Yunzai:yenai:Taboo:${e.group_id}`, JSON.stringify(data)) - e.reply(`设置定时禁言成功，可发【#定时禁言任务】查看`)`` + if (!e.isMaster) return false + if (/任务/.test(e.msg)) { + let task = await redis.keys('Yunzai:yenai:Taboo:*') + if (!task.length) return e.reply('目前还没有定时禁言任务') + let msglist = [`目前定时禁言任务有${task.length}个`] + for (let i = 0; i < task.length; i++) { + let data = JSON.parse(await redis.get(task[i])) + msglist.push(`${i + 1}.\n群号:${data.groupNumber}\n禁言时间:${data.muteTime}\n解禁时间:${data.remTime}`) + } + Cfg.getforwardMsg(e, msglist) + return true + } + if (/取消/.test(e.msg)) { + let data = JSON.parse(await redis.get(`Yunzai:yenai:Taboo:${e.group_id}`)) + if (!data) return e.reply('这群目前没有定时禁言任务') + await redis.del(`Yunzai:yenai:Taboo:${e.group_id}`) + e.reply('此群定时禁言任务删除成功') + return true + } + if (!e.group.is_admin && !e.group.is_owner) { + return e.reply("做不到，怎么想我都做不到吧ヽ(≧Д≦)ノ", true); + } + try { + var muteTime = e.msg.match(/禁言(\d+):(\d+)/)[0].replace(/禁言/g, '') + var remTime = e.msg.match(/解禁(\d+):(\d+)/)[0].replace(/解禁/g, '') + if (muteTime.length != 5 || remTime.length != 5) return e.reply('格式不对\n示范：#定时禁言00:00，解禁08:00') + } catch (err) { + logger.error(err) + e.reply('格式不对\n示范：#定时禁言00:00，解禁08:00') + return + } + + if (muteTime == remTime) return e.reply('没事就吃溜溜梅') + let data = { + groupNumber: e.group_id, + muteTime, + remTime + } + await redis.set(`Yunzai:yenai:Taboo:${e.group_id}`, JSON.stringify(data)) + e.reply(`设置定时禁言成功，可发【#定时禁言任务】查看`)`` } }