From d56b532e989defd75e87425a24dd2b48a624a42f Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sat, 15 Apr 2023 13:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BF=AE=E6=94=B9=E6=90=9C?=
 =?UTF-8?q?=E5=9B=BE=E6=AD=A3=E5=88=99=E9=98=B2=E6=AD=A2=E8=AF=AF=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=B4=E8=A1=94=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                  | 13 +++++++++----
 apps/bika.js                  |  2 +-
 apps/groupAdmin/groupAdmin.js |  3 +--
 apps/picSearch.js             | 17 +++++++++--------
 apps/pixiv.js                 |  2 +-
 apps/setu.js                  |  2 +-
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2703c7e..9f21cd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,15 @@
-# 1.2.3
+# 1.2.4
+
+* 修改**搜图搜番**正则防止误触发
+* 删除`申请头衔`文案
+* 修改部分文案
+
+
+
+# 1.2.1 ~ 1.2.3
 
 * 优化群违禁词匹配，增加违禁词添加人、添加时间
 * 优化群字符列表，字符id显示
-
-# 1.2.1 ~ 1.2.2
-
 * 新增可选依赖项`puppeteer-extra``puppeteer-extra-plugin-stealth`
 * 更新Puppeteer 请求 ascii2d 绕过 cf js challenge
 * 新增`#加精`
diff --git a/apps/bika.js b/apps/bika.js
index 4138f8a..d3e0feb 100644
--- a/apps/bika.js
+++ b/apps/bika.js
@@ -162,7 +162,7 @@ export class NewBika extends plugin {
       return false
     }
     if (!await common.limit(e.user_id, 'bika', Config.bika.limit)) {
-      e.reply('[bika]您已达今日次数上限', true, { at: true })
+      e.reply('您已达今日「bika」次数上限', true, { at: true })
       return false
     }
     return true
diff --git a/apps/groupAdmin/groupAdmin.js b/apps/groupAdmin/groupAdmin.js
index a1f7848..21858f3 100644
--- a/apps/groupAdmin/groupAdmin.js
+++ b/apps/groupAdmin/groupAdmin.js
@@ -3,7 +3,6 @@ import moment from 'moment'
 import { Config } from '../../components/index.js'
 import { common, GroupAdmin as Ga, puppeteer, QQApi, GroupBannedWords } from '../../model/index.js'
 import cronValidate from '../../tools/cronValidate.js'
-import { groupTitleMsg } from '../../constants/msg.js'
 import { Time_unit } from '../../constants/other.js'
 // API请求错误文案
 const API_ERROR = '❎ 出错辣，请稍后重试'
@@ -322,7 +321,7 @@ export class GroupAdmin extends plugin {
 
     if (!Title) return e.reply('什么"(º Д º*)！没有头衔，哼把你的头衔吃掉！！！', true)
 
-    e.reply(_.sample(groupTitleMsg), true)
+    e.reply(`已将你的头衔更换为「${Title}」`, true)
   }
 
   // 字符列表
diff --git a/apps/picSearch.js b/apps/picSearch.js
index da6c4c6..c071e5e 100644
--- a/apps/picSearch.js
+++ b/apps/picSearch.js
@@ -9,25 +9,26 @@ export class NewPicSearch extends plugin {
       priority: 2000,
       rule: [
         {
-          reg: '^#?(椰奶)?(以图)?搜图.*$',
+          reg: '^#?(椰奶)?(以图)?搜图$',
           fnc: 'SauceNAO'
         },
         {
-          reg: /^#?(SauceNAO|sn)搜图.*$/i,
+          reg: /^#?(SauceNAO|sn)搜图$/i,
           fnc: 'SauceNAO'
         },
         {
-          reg: '^#?(椰奶)?(以图)?搜番.*$',
+          reg: /^#?(椰奶|WhatAnime|wa)?(以图)?搜番$/i,
           fnc: 'WhatAnime'
         },
+        {
+          reg: /^#?(Ascii2D|ac)搜图$/i,
+          fnc: 'Ascii2D'
+        },
         {
           reg: /^#设置SauceNAOApiKey.*$/i,
           fnc: 'UploadSauceNAOKey'
-        },
-        {
-          reg: /^#?(Ascii2D|ac)搜图.*$/i,
-          fnc: 'Ascii2D'
         }
+
       ]
     })
   }
@@ -91,7 +92,7 @@ export class NewPicSearch extends plugin {
       return false
     }
     if (!await common.limit(e.user_id, 'picSearch', limit)) {
-      e.reply('[PicSearch]您已达今日次数上限', true, { at: true })
+      e.reply('您已达今日「搜图搜番」次数上限', true, { at: true })
       return false
     }
     return true
diff --git a/apps/pixiv.js b/apps/pixiv.js
index 6cc6268..46a876c 100644
--- a/apps/pixiv.js
+++ b/apps/pixiv.js
@@ -255,7 +255,7 @@ export class NewPixiv extends plugin {
       return false
     }
     if (!await common.limit(e.user_id, 'pixiv', Config.pixiv.limit)) {
-      e.reply('[Pixiv]您已达今日次数上限', true, { at: true })
+      e.reply('您已达今日「Pixiv」次数上限', true, { at: true })
       return false
     }
     return true
diff --git a/apps/setu.js b/apps/setu.js
index 7d52d2e..b68443c 100644
--- a/apps/setu.js
+++ b/apps/setu.js
@@ -109,7 +109,7 @@ export class SeSe extends plugin {
       return false
     }
     if (!await common.limit(e.user_id, 'setu', Config.setu.limit)) {
-      e.reply('[setu]您已达今日次数上限', true, { at: true })
+      e.reply('您已达今日「setu」次数上限', true, { at: true })
       return false
     }
     return true