✨ 细节优化

apps/groupAdmin/groupAnnounce.js

@@ -9,15 +9,15 @@ export class GroupAnnounce extends plugin {
       priority: 500,
       rule: [
         {
-          reg: "^#发群公告",
+          reg: "^#发群?公告",
           fnc: "AddAnnounce"
         },
         {
-          reg: "^#删群公告(\\d+)$",
+          reg: "^#删群?公告(\\d+)$",
           fnc: "DelAnnounce"
         },
         {
-          reg: "^#查群公告$",
+          reg: "^#查群?公告$",
           fnc: "GetAnnounce"
         }
       ]
@@ -28,7 +28,7 @@ export class GroupAnnounce extends plugin {
   async AddAnnounce(e) {
     if (!common.checkPermission(e, "admin", "admin")) { return true }
     // 获取发送的内容
-    let msg = e.msg.replace(/#发群公告/g, "").trim()
+    let msg = e.msg.replace(/#发群?公告/g, "").trim()
     if (!msg) return e.reply("❎ 公告不能为空")
 
     let result = await new QQApi(e).setAnnounce(e.group_id, msg)
@@ -49,7 +49,7 @@ export class GroupAnnounce extends plugin {
   // 删群公告
   async DelAnnounce(e) {
     if (!common.checkPermission(e, "admin", "admin")) { return true }
-    let msg = e.msg.replace(/#删群公告/g, "").trim()
+    let msg = e.msg.replace(/#删群?公告/g, "").trim()
     if (!msg) return e.reply("❎ 序号不可为空")
     let result = await new QQApi(e).delAnnounce(e.group_id, msg)
     if (!result) return e.reply(API_ERROR)

model/State/BotState.js

@@ -14,7 +14,7 @@ export default async function getBotState(e) {
     const { nickname = "未知", status = 11, apk, version } = bot
 
     // 头像
-    const avatarUrl = bot.avatar ?? (Number(bot.uin) ? `https://q1.qlogo.cn/g?b=qq&s=0&nk=${bot.uin}` : "default")
+    const avatarUrl = bot.avatar ?? (Number(bot.uin) ? `https://q1.qlogo.cn/g?b=qq&s=3&nk=${bot.uin}` : "default")
     const avatar = await getAvatarColor(avatarUrl)
 
     const verKey = e.isPro ? "version" : "ver"

resources/state/index.html

@@ -16,6 +16,7 @@
     var Config = JSON.parse('{{@Config}}')
     var _res_path = '{{_res_path}}'
 </script>
+<script src="{{_res_path}}state/js/style.js" defer></script>
 {{each BotStatusList}}
 <div class="box">
     <div class="botInfo">
@@ -45,30 +46,22 @@
                 </span>
             </p>
             <p>
-                {{if $value.countContacts.friend}}<span style="background: #B4A0D8">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/friend.png">
-                    {{$value.countContacts.friend}}
-                </span>{{/if}}
-                {{if $value.countContacts.group}}<span style="background: #e0be92">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/group.png">
-                    {{$value.countContacts.group}}
-                </span>{{/if}}
-                {{if $value.countContacts.groupMember}}<span style="background: #aad5e6">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/groupMember.png">
-                    {{$value.countContacts.groupMember}}
-                </span>{{/if}}
-                {{if $value.messageCount.recv}}<span style="background: #B4A0D8">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/recv.png">
-                    {{$value.messageCount.recv}}
-                </span>{{/if}}
-                {{if $value.messageCount.sent}}<span style="background: #e0be92">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/sent.png">
-                    {{$value.messageCount.sent}}
-                </span>{{/if}}
-                {{if $value.messageCount.screenshot}}<span style="background: #aad5e6">
-                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/screenshot.png">
-                    {{$value.messageCount.screenshot}}
-                </span>{{/if}}
+                {{each $value.countContacts v i}}
+                {{if v}}
+                <span>
+                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/{{i}}.png">
+                    {{v}}
+                </span>
+                {{/if}}
+                {{/each}}
+                {{each $value.messageCount v i}}
+                {{if v}}
+                <span>
+                    <img src="../../../../../plugins/yenai-plugin/resources/state/icon/{{i}}.png">
+                    {{v}}
+                </span>
+                {{/if}}
+                {{/each}}
             </p>
         </div>
     </div>
@@ -129,8 +122,6 @@
 </div>
 {{/if}}
 
-<script src="{{_res_path}}state/js/style.js"></script>
-
 {{if chartData}}
 <div class="box" data-boxInfo="图表">
     <div id="Chart" style="height: 300px"></div>