Merge pull request #471 from Giftia/dev

v3.8.0
Giftia · Mar 18, 2024 · 2573cd3 · 2573cd3
2 parents ec8b49c + 9a2e768
commit 2573cd3
Show file tree

Hide file tree

Showing 22 changed files with 8,879 additions and 183,343 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -0,0 +1,8 @@
+extends:
+  - 'eslint-config-prettier'
+  - 'eslint:recommended'
+  - 'plugin:node/recommended'
+  - 'prettier'
+settings: {}
+rules:
+  n/no-missing-import: off
diff --git a/.github/workflows/Incremental-update.yaml b/.github/workflows/Incremental-update.yaml
@@ -11,13 +11,13 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js v14
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Use Node.js v18
+        uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
           architecture: x64
-          cache: "npm"
+          cache: 'npm'
           cache-dependency-path: ./package-lock.json
 
       - name: Remove conflicting files
@@ -75,7 +75,7 @@ jobs:
         run: echo "now=$(date +'%Y-%m-%d-%H-%M-%S')" >> $GITHUB_OUTPUT
 
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ChatDACS-${{ env.VERSION_NUMBER }}_Update-Package-${{ steps.time.outputs.now }}
           path: ChatDACS-${{ env.VERSION_NUMBER }}_Update-Package.zip

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,18 +18,18 @@ jobs:
           - windows-latest
           - ubuntu-latest
         node_version:
-          - 14
+          - 18
         architecture:
           - x64
     name: Build On：${{ matrix.os }}_${{ matrix.architecture }} - Node ${{ matrix.node_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}
-          cache: "npm"
+          cache: 'npm'
           cache-dependency-path: |
             ./package-lock.json
             plugins/package-lock.json
@@ -112,7 +112,7 @@ jobs:
         run: echo "now=$(date +'%Y-%m-%d-%H-%M-%S')" >> $GITHUB_OUTPUT
 
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ChatDACS-${{ env.VERSION_NUMBER }}_${{ runner.os }}-${{ steps.time.outputs.now }}
           path: ChatDACS-${{ env.VERSION_NUMBER }}_${{ runner.os }}.zip

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -0,0 +1,6 @@
+printWidth: 120
+singleQuote: true
+trailingComma: "all"
+semi: false
+proseWrap: "never"
+bracketSpacing: false
diff --git a/README.md b/README.md
@@ -36,11 +36,13 @@
   &nbsp;
   <a href="http://110.42.221.72/"><img src="https://img.shields.io/website?label=demo&style=for-the-badge&up_message=online&url=http://110.42.221.72/" alt="Demo" /></a>
   &nbsp;
-  <a href="https://github.com/Giftia/ChatDACS/actions/workflows/build.yml" target="_blank"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/Giftia/ChatDACS/Build%20ChatDACS%20One-Click-To-Deploy%20Package%20(ChatDACS%E4%B8%80%E9%94%AE%E8%BF%90%E8%A1%8C%E5%8C%85%E6%9E%84%E5%BB%BA)?label=%E8%87%AA%E5%8A%A8%E6%9E%84%E5%BB%BA&logo=node.js&style=for-the-badge" alt="Workflow" /></a>
+  <a href="https://github.com/Giftia/ChatDACS/actions/workflows/build.yml" target="_blank"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/Giftia/ChatDACS/build.yml?branch=master&label=%E8%87%AA%E5%8A%A8%E6%9E%84%E5%BB%BA&logo=node.js&style=for-the-badge" alt="Workflow" /></a>
   &nbsp;
   <img src="https://img.shields.io/github/license/Giftia/ChatDACS?label=%E5%BC%80%E6%BA%90%E8%AE%B8%E5%8F%AF&style=for-the-badge" alt="License" />
   &nbsp;
   <img src="https://img.shields.io/github/languages/code-size/Giftia/ChatDACS?label=%E4%BB%A3%E7%A0%81%E5%A4%A7%E5%B0%8F&style=for-the-badge" alt="Code size" />
+  &nbsp;
+  <img src="https://wakatime.com/badge/user/f99347b4-b512-4148-ad75-ec1d4a1c3712/project/497778d6-79f8-4f7f-b299-5e75d106f6d6.svg?style=for-the-badge" alt="Code size" />
 </p>
 
 ---

diff --git a/config/config.yml b/config/config.yml
@@ -21,44 +21,44 @@ System:
   WEB_PORT: 80
 
   #监听go_cqhttp的反向http post服务，如果有冲突的话请尝试更改:
-  GO_CQHTTP_SERVICE_ANTI_POST_API: "/bot"
+  GO_CQHTTP_SERVICE_ANTI_POST_API: '/bot'
 
   #go_cqhttp的http接口地址，如果有冲突的话请尝试更改:
-  GO_CQHTTP_SERVICE_API_URL: "127.0.0.1:5700"
+  GO_CQHTTP_SERVICE_API_URL: '127.0.0.1:5700'
 
 #接口密钥配置
 ApiKey:
   #天行接口key，申请地址 https://www.tianapi.com/
-  TIAN_XING_API_KEY: ""
+  TIAN_XING_API_KEY: ''
 
   #卡特实验室接口key，申请地址 https://api.sumt.cn/
-  SUMT_API_KEY: ""
+  SUMT_API_KEY: ''
 
   #息知频道key，申请地址 https://xz.qqoq.net/
-  XIZHI_CHANNEL_KEY: ""
+  XIZHI_CHANNEL_KEY: ''
 
   #QQ频道BotAppID，申请地址 https://q.qq.com/，获取地址 https://q.qq.com/bot/#/developer/developer-setting
-  QQ_GUILD_APP_ID: ""
+  QQ_GUILD_APP_ID: ''
 
   #QQ频道机器人令牌，申请地址 https://q.qq.com/，获取地址 https://q.qq.com/bot/#/developer/developer-setting
-  QQ_GUILD_TOKEN: ""
+  QQ_GUILD_TOKEN: ''
 
   #Telegram Bot Token，申请地址 https://t.me/BotFather
-  TELEGRAM_BOT_TOKEN: ""
+  TELEGRAM_BOT_TOKEN: ''
 
 #qqBot配置
 qqBot:
   #qqBot小夜的管理员列表，管理员有权执行管理员指令，且第一位管理员将会处理用户邀请小夜加群的请求:
-  QQBOT_ADMIN_LIST: ["1005056803", "2418754147", "38263547"]
+  QQBOT_ADMIN_LIST: ['1005056803', '2418754147', '38263547']
 
   #qq入群欢迎语，@新人 出现的部分将会替换成 @新人:
-  QQ_GROUP_WELCOME_MESSAGE: "@新人 你好呀，我是本群RBQ担当小夜！小夜的说明书在这里 https://docs.giftia.moe/ 噢，请问主人是要先吃饭呢，还是先洗澡呢，还是先*我呢~"
+  QQ_GROUP_WELCOME_MESSAGE: '@新人 你好呀，我是本群RBQ担当小夜！小夜的说明书在这里 https://docs.giftia.moe/ 噢，请问主人是要先吃饭呢，还是先洗澡呢，还是先*我呢~'
 
   #戳一戳的文案:
-  QQ_GROUP_POKE_REPLY_MESSAGE: "请不要戳小小夜 >_<"
+  QQ_GROUP_POKE_REPLY_MESSAGE: '请不要戳小小夜 >_<'
 
   #戳坏了的文案:
-  QQ_GROUP_POKE_BOOM_REPLY_MESSAGE: "哎呀戳坏了，不理你了 ٩(๑`^`๑)۶"
+  QQ_GROUP_POKE_BOOM_REPLY_MESSAGE: '哎呀戳坏了，不理你了 ٩(๑`^`๑)۶'
 
   #自动批准好友请求开关，如果不启用，陌生人将不能邀请小夜加群:
   AUTO_APPROVE_QQ_FRIEND_REQUEST_SWITCH: true
@@ -85,107 +85,107 @@ qqBot:
   #教学系统的黑名单:
   CHAT_BAN_WORDS:
     [
-      "群:",
-      "群：",
-      "你国",
-      "批",
-      "kp",
-      "kk",
-      "中国",
-      "一国两制",
-      "章沛麒",
-      "援交",
-      "官网",
-      "煞笔",
-      "支付宝",
-      "做爱",
-      "苟",
-      "nigg",
-      "管理员",
-      "是谁",
-      "滚",
-      "弱智",
-      "傻",
-      "操",
-      "屁眼",
-      "坟",
-      "妈",
-      "滚",
-      "肉便",
-      "便器",
-      "废物",
-      "屎",
-      "脑残",
-      "垃圾",
-      "孙子",
-      "荀",
-      "习近",
-      "江泽",
-      "近平",
-      "泽民",
-      "果喵",
-      "shabi",
-      "贱",
-      "抽心",
-      "小日",
-      "抽卡历史",
-      "支付",
-      "付宝",
-      "状态",
-      "红包",
-      "领取",
-      "膜法",
-      "学习一个",
-      "吼啊",
-      "钦定",
-      "旁的意思",
-      "蛤",
-      "奉告",
-      "大新闻",
-      "1s",
-      "高到",
-      "谈笑风生",
-      "兹辞",
-      "支不支持",
-      "我是支持的",
-      "excited",
-      "exciting",
-      "赛艇",
-      "一秒",
-      "两秒",
-      "续命",
-      "香港",
-      "长者",
-      "naive",
-      "naïve",
-      "angry",
-      "我很抱歉",
-      "西方记者",
-      "我可以说",
-      "搞的这个",
-      "董先生",
-      "连任",
-      "主席",
-      "也支持他",
-      "彭定康",
-      "你也有责任",
-      "钦点",
-      "铁骑",
-      "稍有常识的人",
-      "螳臂当车",
-      "苟利国家生死以",
-      "苟利",
-      "生死以",
-      "岂因祸福避趋之",
-      "岂因祸福",
-      "避趋",
-      "闷声",
-      "图样",
-      "图森",
-      "着风",
-      "得风",
-      "得雨",
-      "是雨",
+      '群:',
+      '群：',
+      '你国',
+      '批',
+      'kp',
+      'kk',
+      '中国',
+      '一国两制',
+      '章沛麒',
+      '援交',
+      '官网',
+      '煞笔',
+      '支付宝',
+      '做爱',
+      '苟',
+      'nigg',
+      '管理员',
+      '是谁',
+      '滚',
+      '弱智',
+      '傻',
+      '操',
+      '屁眼',
+      '坟',
+      '妈',
+      '滚',
+      '肉便',
+      '便器',
+      '废物',
+      '屎',
+      '脑残',
+      '垃圾',
+      '孙子',
+      '荀',
+      '习近',
+      '江泽',
+      '近平',
+      '泽民',
+      '果喵',
+      'shabi',
+      '贱',
+      '抽心',
+      '小日',
+      '抽卡历史',
+      '支付',
+      '付宝',
+      '状态',
+      '红包',
+      '领取',
+      '膜法',
+      '学习一个',
+      '吼啊',
+      '钦定',
+      '旁的意思',
+      '蛤',
+      '奉告',
+      '大新闻',
+      '1s',
+      '高到',
+      '谈笑风生',
+      '兹辞',
+      '支不支持',
+      '我是支持的',
+      'excited',
+      'exciting',
+      '赛艇',
+      '一秒',
+      '两秒',
+      '续命',
+      '香港',
+      '长者',
+      'naive',
+      'naïve',
+      'angry',
+      '我很抱歉',
+      '西方记者',
+      '我可以说',
+      '搞的这个',
+      '董先生',
+      '连任',
+      '主席',
+      '也支持他',
+      '彭定康',
+      '你也有责任',
+      '钦点',
+      '铁骑',
+      '稍有常识的人',
+      '螳臂当车',
+      '苟利国家生死以',
+      '苟利',
+      '生死以',
+      '岂因祸福避趋之',
+      '岂因祸福',
+      '避趋',
+      '闷声',
+      '图样',
+      '图森',
+      '着风',
+      '得风',
+      '得雨',
+      '是雨',
     ]
 
 #杂项配置