From b13e85539d296f00e651a4d7a6fabc664fa7ac85 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Mon, 14 Nov 2022 00:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sesepro=E5=88=86=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/fun.js   |  5 ++++-
 apps/pixiv.js |  2 +-
 apps/set.js   | 62 ++++++++++++++++++++++++++-------------------------
 apps/setu.js  |  6 +++--
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/apps/fun.js b/apps/fun.js
index 800218e..23dc29a 100644
--- a/apps/fun.js
+++ b/apps/fun.js
@@ -217,7 +217,7 @@ export class example extends plugin {
   //黑丝
   async heisiwu(e) {
     if (!e.isMaster) {
-      if (!Config.Notice.sese) return
+      if (!Config.Notice.sesepro) return
     }
     await e.reply("少女祈祷中......")
     let types = heisiwreg.exec(e.msg)
@@ -303,6 +303,9 @@ export class example extends plugin {
     }
     let url = "https://ovooa.com/API/Pximg/"
     if (/pro/.test(e.msg)) {
+      if (!e.isMaster) {
+        if (!Config.Notice.sesepro) return
+      }
       url = "https://xiaobapi.top/api/xb/api/setu.php"
     }
     let res = await fetch(url).then(res => res.json()).catch(err => console.log(err))
diff --git a/apps/pixiv.js b/apps/pixiv.js
index c95768e..e16809b 100644
--- a/apps/pixiv.js
+++ b/apps/pixiv.js
@@ -23,7 +23,7 @@ let listreg = new RegExp(`^#?看看(${Object.keys(type).join("|")})榜\\s?(第($
 let tagreg = new RegExp('^#?tag搜图(.*)$', "i")
 let pidreg = new RegExp('^#?pid搜图\\s?(\\d+)$', "i")
 let uidreg = new RegExp('^#?uid搜图(.*)$', "i")
-let randomimgreg = new RegExp(`^#?来(${Numreg})?张(好(康|看)(的|哒)|hkd)$`)
+let randomimgreg = new RegExp(`^#?来(${Numreg})?张(好(康|看)(的|哒)|hkd|涩图)$`)
 
 export class example extends plugin {
     constructor() {
diff --git a/apps/set.js b/apps/set.js
index 692b9a7..21ae284 100644
--- a/apps/set.js
+++ b/apps/set.js
@@ -3,7 +3,34 @@ import fs from "fs";
 import lodash from "lodash";
 import { Config, render } from '../components/index.js'
 
+const configs = {
+    "好友消息": "privateMessage",
+    "群消息": "groupMessage",
+    "群临时消息": "grouptemporaryMessage",
+    "群撤回": "groupRecall",
+    "好友撤回": "PrivateRecall",
+    // 申请通知
+    "好友申请": "friendRequest",
+    "群邀请": "groupInviteRequest",
+    // 信息变动
+    "群管理变动": "groupAdminChange",
+    // 列表变动
+    "好友列表变动": "friendNumberChange",
+    "群聊列表变动": "groupNumberChange",
+    "群成员变动": "groupMemberNumberChange",
+    // 其他通知
+    "闪照": "flashPhoto",
+    "禁言": "botBeenBanned",
+    "全部通知": "notificationsAll",
+    "删除缓存": "deltime",
+    "涩涩": "sese",
+    "状态": "state",
+    "涩涩pro": "sesepro"
+}
+
 let rediskey = `yenai:proxy`
+let deltimereg = new RegExp('^#椰奶设置删除缓存时间(\\d+)秒?$')
+let managereg = new RegExp(`^#椰奶设置(${Object.keys(configs).join("|")})(开启|关闭)$`)
 export class NewConfig extends plugin {
     constructor() {
         super({
@@ -12,11 +39,11 @@ export class NewConfig extends plugin {
             priority: 100,
             rule: [
                 {
-                    reg: '^#椰奶设置(.*)(开启|关闭)$',
+                    reg: managereg,
                     fnc: 'Config_manage'
                 },
                 {
-                    reg: '^#椰奶设置删除缓存时间(.*)$',
+                    reg: deltimereg,
                     fnc: 'Config_deltime'
                 },
                 {
@@ -47,7 +74,9 @@ export class NewConfig extends plugin {
         if (!e.isMaster) return
         // 解析消息
         let index = e.msg.replace(/#|椰奶设置|开启|关闭/g, "")
+        if (index == "涩涩pro") {
 
+        }
         if (!configs.hasOwnProperty(index)) return
         // 开启还是关闭
         if (/开启/.test(e.msg)) {
@@ -64,11 +93,7 @@ export class NewConfig extends plugin {
     async Config_deltime(e) {
         if (!e.isMaster) return
 
-        let time = e.msg.replace(/#|椰奶设置删除缓存时间/g, '').trim()
-
-        time = time.match(/\d+/g)
-
-        if (!time) return e.reply('❎ 请输入正确的时间(单位s)')
+        let time = deltimereg.exec(e.msg)[1]
 
         if (time < 120) return e.reply('❎ 时间不能小于两分钟')
 
@@ -194,26 +219,3 @@ const getStatus = function (rote) {
 
 }
 
-const configs = {
-    好友消息: "privateMessage",
-    群消息: "groupMessage",
-    群临时消息: "grouptemporaryMessage",
-    群撤回: "groupRecall",
-    好友撤回: "PrivateRecall",
-    // 申请通知
-    好友申请: "friendRequest",
-    群邀请: "groupInviteRequest",
-    // 信息变动
-    群管理变动: "groupAdminChange",
-    // 列表变动
-    好友列表变动: "friendNumberChange",
-    群聊列表变动: "groupNumberChange",
-    群成员变动: "groupMemberNumberChange",
-    // 其他通知
-    闪照: "flashPhoto",
-    禁言: "botBeenBanned",
-    全部通知: "notificationsAll",
-    删除缓存: "deltime",
-    涩涩: "sese",
-    状态: "state"
-}
\ No newline at end of file
diff --git a/apps/setu.js b/apps/setu.js
index 45eef9a..2d4b577 100644
--- a/apps/setu.js
+++ b/apps/setu.js
@@ -66,7 +66,9 @@ export class sese extends plugin {
   }
 
   async seturd(e) {
-    if (!e.isMaster) if (!Config.Notice.sese) return
+    if (!e.isMaster) {
+      if (!Config.Notice.sesepro) return
+    }
 
     if (await setu.getcd(e)) return e.reply(` ${lodash.sample(CDMsg)}你的CD还有${cds}`, false, { at: true })
 
@@ -94,7 +96,7 @@ export class sese extends plugin {
   //tag搜图
   async setutag(e) {
     if (!e.isMaster) {
-      if (!Config.Notice.sese) return
+      if (!Config.Notice.sesepro) return
     }
 
     let cds = await setu.getcd(e)