From d2e32faa08167087cd3a82a016239c29df854d7d Mon Sep 17 00:00:00 2001
From: Ctrlcvs <1509167646@qq.com>
Date: Sun, 7 May 2023 18:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=AD=BE=E5=88=B0=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E5=88=AB=E5=90=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85`=E6=B8=B8=E6=88=8F=E7=AD=BE=E5=88=B0`=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=EF=BC=8C=E6=94=AF=E6=8C=81=E5=BD=93=E5=89=8D=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=BB=91=E5=AE=9A=E7=9A=84=E5=85=A8=E9=83=A8=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E6=A8=A1=E5=9D=97=E7=AD=BE=E5=88=B0=EF=BC=88=E9=9C=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9C=89=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97~=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/sign.js         |  8 +++++++-
 defSet/json/mys.json | 21 ++++++++++++++-------
 model/mys/utils.js   |  4 ++--
 model/user.js        |  7 ++++---
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/sign.js b/apps/sign.js
index 8e8cd03..9b8156e 100644
--- a/apps/sign.js
+++ b/apps/sign.js
@@ -1,8 +1,14 @@
 import User from "../model/user.js"
 import moment from 'moment';
+import lodash from 'lodash'
+import {
+	Data
+} from "../components/index.js";
+const _path = process.cwd();
+let ForumData = Data.readJSON(`${_path}/plugins/xiaoyao-cvs-plugin/defSet/json`, "mys")
 export const rule = {
 	sign: {
-		reg: `^#*(原神|崩坏3|崩坏2|未定事件簿|崩坏星穹铁道)签到$`,
+		reg: `^#*(${lodash.map(ForumData,v=> v.otherName.join('|')).join('|')}|游戏)签到$`,
 		describe: "米社规则签到"
 	},
 	bbsSign: {
diff --git a/defSet/json/mys.json b/defSet/json/mys.json
index 0981448..4842d6f 100644
--- a/defSet/json/mys.json
+++ b/defSet/json/mys.json
@@ -3,42 +3,49 @@
     "id": "1",
     "forumId": "1",
     "name": "崩坏3",
-    "url": "https://bbs.mihoyo.com/bh3/"
+    "url": "https://bbs.mihoyo.com/bh3/",
+    "otherName":["bh3","崩崩崩","崩坏2"]
   },
   {
     "id": "2",
     "forumId": "26",
     "name": "原神",
-    "url": "https://bbs.mihoyo.com/ys/"
+    "url": "https://bbs.mihoyo.com/ys/",
+    "otherName":["原神"]
   },
   {
     "id": "3",
     "forumId": "30",
     "name": "崩坏2",
-    "url": "https://bbs.mihoyo.com/bh2/"
+    "url": "https://bbs.mihoyo.com/bh2/",
+    "otherName":["bh2","崩崩","崩坏2"]
   },
   {
     "id": "4",
     "forumId": "37",
     "name": "未定事件簿",
-    "url": "https://bbs.mihoyo.com/wd/"
+    "url": "https://bbs.mihoyo.com/wd/",
+    "otherName":["事件簿","未定事件簿"]
   },
   {
     "id": "5",
     "forumId": "34",
     "name": "大别野",
-    "url": "https://bbs.mihoyo.com/dby/"
+    "url": "https://bbs.mihoyo.com/dby/",
+    "otherName":["大别野"]
   },
   {
     "id": "6",
     "forumId": "52",
     "name": "崩坏星穹铁道",
-    "url": "https://bbs.mihoyo.com/sr/"
+    "url": "https://bbs.mihoyo.com/sr/",
+    "otherName":["sr","星铁","穹轨","崩坏星穹铁道"]
   },
   {
      "id": "7",
      "forumId": "57",
      "name": "绝区零",
-     "url": "https://bbs.mihoyo.com/zzz/"
+     "url": "https://bbs.mihoyo.com/zzz/",
+     "otherName":["绝区零","zzz"]
   }
 ]
\ No newline at end of file
diff --git a/model/mys/utils.js b/model/mys/utils.js
index aefd42e..d3c0ee0 100644
--- a/model/mys/utils.js
+++ b/model/mys/utils.js
@@ -118,9 +118,9 @@ export async function getCookieMap(cookie) {
  */
 export function recallMsg(e,r,times){
 	setTimeout(()=>{
-		if(e?.group){
+		if(e?.group?.recallMsg){
 			e?.group?.recallMsg(r.message_id)
-		}else{
+		}else if(e?.friend?.recallMsg){
 			e?.friend?.recallMsg(r.message_id)
 		}
 	},1000 * times)
diff --git a/model/user.js b/model/user.js
index 9e90d1b..f239463 100644
--- a/model/user.js
+++ b/model/user.js
@@ -857,9 +857,10 @@ export default class user {
 		})
 	}
 	getDataList(name) {
-		for (let item of this.ForumData) {
-			if (item.name == name) { //循环结束未找到的时候返回原数组签到全部
-				return [item]
+		let otherName = lodash.map(this.ForumData,'otherName')
+		for (let [index,item] of Object.entries(otherName)) {
+			if (item.includes(name)) { //循环结束未找到的时候返回原数组签到全部
+				return [this.ForumData[index]]
 			}
 		}
 		return this.ForumData;