From c64592d54c8490906ad6eb184b7842f4519fa66b Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Wed, 21 Aug 2024 13:41:45 +0800
Subject: [PATCH] =?UTF-8?q?Napcat=202.0=20=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:sparkles: napcat 2.0 支持，支持多分离式分组获取方式；支持分组排序信息
:bug: 修正 jsonpath 解析器无法拉取列表的问题
:lipstick: 脚本列表样式修改
:poop: 去除了独立回复消息字段支持的旧代码
:page_facing_up: direnv、asdf 配置文件补充，移除 nvm 配置文件
---
 .envrc                                |  1 +
 .nvmrc                                |  1 -
 .tool-versions                        |  1 +
 src/assets/css/append/append_new.css  |  8 +--
 src/assets/pathMap/NapCat.Onebot.yaml | 15 ++++-
 src/background.ts                     |  4 +-
 src/components/MsgBody.vue            | 35 +----------
 src/function/electron/ipc.ts          |  2 +-
 src/function/msg.ts                   | 63 +++++++++++++++++---
 src/function/utils/msgUtil.ts         |  2 +-
 src/pages/Scripts.vue                 | 84 ++++++++++++++++++---------
 src/pages/chat-view/SystemNotice.vue  |  4 +-
 src/pages/options/OptDev.vue          |  2 +-
 13 files changed, 139 insertions(+), 83 deletions(-)
 create mode 100644 .envrc
 delete mode 100644 .nvmrc
 create mode 100644 .tool-versions

diff --git a/.envrc b/.envrc
new file mode 100644
index 00000000..b7e8bccc
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+export PYTHON_PATH=/Library/Frameworks/Python.framework/Versions/2.7/bin/python
diff --git a/.nvmrc b/.nvmrc
deleted file mode 100644
index 25bf17fc..00000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-18
\ No newline at end of file
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..343dc534
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+nodejs 18.18.2
diff --git a/src/assets/css/append/append_new.css b/src/assets/css/append/append_new.css
index 1dec176b..9c02066b 100644
--- a/src/assets/css/append/append_new.css
+++ b/src/assets/css/append/append_new.css
@@ -652,20 +652,20 @@
 }
 .script-view .list > header > span {
     margin: 10px -5px 0 -5px;
-    font-size: 0.8rem;
+    font-size: 0.75rem;
 }
 .script-view .list-body {
     margin: 0 -5px;
 }
 .script-view .list-body h2 {
-    font-size: 0.9rem;
+    font-size: 0.8rem;
 }
 .script-view .list-body span {
-    font-size: 0.8rem;
+    font-size: 0.75rem;
 }
 .script-view .list-body span svg {
     margin: 0;
-    font-size: 0.75rem;
+    font-size: 0.7rem;
 }
 .script-view .editor-main {
     box-shadow: -5px 0px 4px -5px var(--color-shader);
diff --git a/src/assets/pathMap/NapCat.Onebot.yaml b/src/assets/pathMap/NapCat.Onebot.yaml
index 60609643..6c684595 100644
--- a/src/assets/pathMap/NapCat.Onebot.yaml
+++ b/src/assets/pathMap/NapCat.Onebot.yaml
@@ -15,10 +15,10 @@ login_info:
 # 群、好友列表
 friend_list:
     name: get_friends_with_category
-    source: $.data[*]
+    source: $.data[*].buddyList[*]
     list:
-        class_id: /categoryId
-        class_name: /categroyName
+        class_id: null
+        class_name: null
         user_id: /user_id
         nickname: /nickname
         remark: /remark
@@ -31,6 +31,15 @@ group_list:
         group_name: /group_name
         member_count: /member_count
         admin_flag: null
+# 好友分组
+friend_category:
+    name: get_friends_with_category
+    source: $.data[*]
+    list:
+        class_id: /categoryId
+        class_name: /categoryName
+        sort_id: /categorySortId
+        users: $.buddyList[*].user_id
 # 消息列表
 message_list:
     name: get_group_msg_history
diff --git a/src/background.ts b/src/background.ts
index 7bad8e86..ef593def 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -175,8 +175,8 @@ app.on('ready', async () => {
     if (isDevelopment && !process.env.IS_TEST) {
         try {
             await installExtension('nhdogjmejiglipccpnnnanhbledajbpd')
-        } catch (e: any) {
-            console.error('Vue Devtools failed to install:', e.toString())
+        } catch (e: unknown) {
+            console.error('Vue Devtools failed to install:', (e as Error).toString())
         }
     }
     createWindow()
diff --git a/src/components/MsgBody.vue b/src/components/MsgBody.vue
index a72d34d7..7dd26830 100644
--- a/src/components/MsgBody.vue
+++ b/src/components/MsgBody.vue
@@ -23,12 +23,6 @@
                 {{ isMe ? runtimeData.loginInfo.nickname : runtimeData.chatInfo.show.name }}
             </a>
             <div>
-                <!-- 回复指示框（独立版本） -->
-                <div v-if="data.source && data.source.seq" :class="isMe ? (type == 'merge' ? 'msg-replay' : 'msg-replay me') : 'msg-replay'"
-                    @click="scrollToMsg(data.source.seq)">
-                    <font-awesome-icon :icon="['fas', 'reply']" />
-                    <a> {{ getRepInfo((data.source ? data.source.message : ''), data) }} </a>
-                </div>
                 <!-- 消息体 -->
                 <template v-if="!hasCard()">
                     <div v-for="(item, index) in data.message" :class="View.isMsgInline(item.type) ? 'msg-inline' : ''" :key="data.message_id + '-m-' + index">
@@ -44,7 +38,7 @@
                         <img v-else-if="item.type == 'mface' && item.url" @load="scrollButtom" @error="imgLoadFail" :class="imgStyle(data.message.length, index, item.asface) + ' msg-mface'" :src="item.url">
                         <span v-else-if="item.type == 'mface' && item.text" class="msg-unknown">{{ item.text }}</span>
                         <span v-else-if="item.type == 'bface'" style="font-style: italic;opacity: 0.7;">[ {{ $t('chat_fun_menu_pic') }}：{{ item.text }} ]</span>
-                        <div v-else-if="item.type == 'at'" v-show="isAtShow(data.source, item.qq)" :class="getAtClass(item.qq)">
+                        <div v-else-if="item.type == 'at'" :class="getAtClass(item.qq)">
                             <a @mouseenter="showUserInfo" :data-id="item.qq" :data-group="data.group_id">{{ getAtName(item) }}</a>
                         </div>
                         <div v-else-if="item.type == 'file'" :class="'msg-file' + (isMe ? ' me' : '')">
@@ -174,18 +168,6 @@ export default defineComponent({
             return getMsgRawTxt(message)
         },
 
-        /**
-         * 判断是否需要隐藏重复的 At
-         * @param source 回复信息
-         * @param at at 信息
-         */
-        isAtShow (source: any, at: any) {
-            if (source) {
-                return !(at === source.user_id)
-            }
-            return true
-        },
-
         /**
          * 根据消息状态获取 At 消息实际的 CSS class
          * @param who 
@@ -423,21 +405,6 @@ export default defineComponent({
             }
         },
 
-        /**
-         * 获取回复内容（拼接名字和消息内容）
-         * @param msg 消息对象
-         * @param data 回复信息
-         */
-        getRepInfo (msg: any, data: any) {
-            const list = this.runtimeData.chatInfo.info.group_members.filter((item) => {
-                return Number(item.user_id) === Number(data.source.user_id)
-            })
-            if (list.length === 1) {
-                return (list[0].card !== '' ? list[0].card : list[0].nickname) + ': ' + msg
-            }
-            return msg
-        },
-
         /**
          * 尝试在消息列表中寻找这条被回复的消息，获取消息内容
          * @param message_id 
diff --git a/src/function/electron/ipc.ts b/src/function/electron/ipc.ts
index 5e9db4ff..b7850801 100644
--- a/src/function/electron/ipc.ts
+++ b/src/function/electron/ipc.ts
@@ -89,7 +89,7 @@ export function regIpcListener() {
     })
     // 获取补充的调试信息
     ipcMain.handle('opt:getSystemInfo', () => {
-        const systemInfo = {} as { [key: string]: any }
+        const systemInfo = {} as { [key: string]: [string, string] }
         systemInfo.electron = ['Electron Version', process.versions.electron]
         return systemInfo
     })
diff --git a/src/function/msg.ts b/src/function/msg.ts
index 49224962..cb2fc40d 100644
--- a/src/function/msg.ts
+++ b/src/function/msg.ts
@@ -28,7 +28,6 @@ import { GroupMemberInfoElem, UserFriendElem, UserGroupElem, MsgItemElem, RunTim
 import { NotificationElem } from './elements/system'
 import { IPinyinOptions } from 'pinyin/lib/declare'
 
-const logger = new Logger()
 const popInfo = new PopInfo()
 // eslint-disable-next-line
 let msgPath = require('@/assets/pathMap/Lagrange.OneBot.yaml')
@@ -52,6 +51,7 @@ export function parse(str: string) {
                 case 'getMoreLoginInfo'         : runtimeData.loginInfo.info = msg.data.data.result.buddy.info_list[0]; break
                 case 'getGroupList'             : saveUser(msg, 'group'); break
                 case 'getFriendList'            : saveUser(msg, 'friend'); break
+                case 'getFriendCategory'        : saveClassInfoAlone(msg); break
                 case 'getUserInfoInGroup'       : runtimeData.chatInfo.info.me_info = msg; break
                 case 'getGroupMemberList'       : saveGroupMember(msg.data); break
                 case 'getChatHistoryFist'       : saveMsg(msg, 'top'); break
@@ -245,9 +245,23 @@ function saveUser(msg: { [key: string]: any }, type: string) {
         switch(type) {
             case 'friend':
                 list = getMsgData('friend_list', msg, msgPath.friend_list)
+                if(list)
+                    // 根据 user_id 去重
+                    list = list.filter((item, index, arr) => {
+                        return arr.findIndex((item2) => {
+                            return item2.user_id == item.user_id
+                        }) == index
+                    })
                 break
             case 'group':
                 list = getMsgData('group_list', msg, msgPath.group_list)
+                if(list)
+                    // 根据 group_id 去重
+                    list = list.filter((item, index, arr) => {
+                        return arr.findIndex((item2) => {
+                            return item2.group_id == item.group_id
+                        }) == index
+                    })
                 break
         }
     }
@@ -324,6 +338,10 @@ function saveUser(msg: { [key: string]: any }, type: string) {
         if(runtimeData.jsonMap.recent_contact)
             Connector.send(runtimeData.jsonMap.recent_contact.name, {}, 'GetRecentContact')
     }
+    // 如果是分离式的好友列表，继续获取分类信息
+    if(type == 'friend' && runtimeData.jsonMap.friend_category) {
+        Connector.send(runtimeData.jsonMap.friend_category.name, {}, 'getFriendCategory')
+    }
 }
 
 function updateTopMsg(msg: any, echoList: string[]) {
@@ -349,7 +367,29 @@ function updateTopMsg(msg: any, echoList: string[]) {
     }
 }
 
-function saveClassInfo(list: { class_id: number, class_name: string }[]) {
+function saveClassInfoAlone(msg: any) {
+    const list = getMsgData('friend_category', msg, msgPath.friend_category) as {
+        class_id: number,
+        class_name: string,
+        sort_id: number,
+        users: number[]
+    }[]
+    if (list != undefined) {
+        saveClassInfo(list)
+    }
+    // 刷新用户列表的分类信息
+    list.forEach((item) => {
+        item.users.forEach((id) => {
+            runtimeData.userList.forEach((user) => {
+                if (user.user_id == id && user.class_id == undefined) {
+                    user.class_id = item.class_id
+                    user.class_name = item.class_name
+                }
+            })
+        })
+    })
+}
+function saveClassInfo(list: { class_id: number, class_name: string, sort_id?: number }[]) {
     // 按拼音重新排序
     // const names = [] as string[]
     // list.forEach((item) => {
@@ -365,12 +405,21 @@ function saveClassInfo(list: { class_id: number, class_name: string }[]) {
     //     })
     // })
 
-    // 按 class_id 排序
-    const back = list.sort((a, b) => {
-        return a.class_id - b.class_id
-    })
+    if(list[0].sort_id != undefined) {
+        // 如果有 sort_id，按 sort_id 排序，从小到大
+        list.sort((a, b) => {
+            if(a.sort_id && b.sort_id) 
+                return a.sort_id - b.sort_id
+            else return 0
+        })
+    } else {
+        // 按 class_id 排序
+        list.sort((a, b) => {
+            return a.class_id - b.class_id
+        })
+    }
 
-    runtimeData.tags.classes = back
+    runtimeData.tags.classes = list
 }
 
 function saveGroupMember(data: GroupMemberInfoElem[]) {
diff --git a/src/function/utils/msgUtil.ts b/src/function/utils/msgUtil.ts
index 85a531ba..4d282d71 100644
--- a/src/function/utils/msgUtil.ts
+++ b/src/function/utils/msgUtil.ts
@@ -39,7 +39,7 @@ export function getMsgData(name: string, msg: { [key: string]: any }, map: strin
                                         nameKey = name
                                         regexKey = key
                                     }
-                                    itemObj[key] = jp.query(item, replaceJPValue(nameKey))[0]
+                                    itemObj[key] = jp.query(item, replaceJPValue(nameKey))
                                     if(regexKey != null) {
                                         const regex = new RegExp(regexKey)
                                         const match = itemObj[key].match(regex)
diff --git a/src/pages/Scripts.vue b/src/pages/Scripts.vue
index e83e44ec..5640e310 100644
--- a/src/pages/Scripts.vue
+++ b/src/pages/Scripts.vue
@@ -20,21 +20,21 @@
                 <div v-for="(item, index) in savedList"
                     :class="{selected: (select == item.title && editScript)}"
                     :key="index">
-                    <div @click="selectItem(item)">
-                        <div style="flex: 1">
-                            <h2>{{ item.title }}</h2>
+                    <div>
+                        <div style="flex: 1" @click="selectItem(item)">
+                            <h2>
+                                {{ item.title }}
+                                <span style="font-size: 0.7rem;" v-if="item.enabled">{{ $t('statue_enabled') }}</span>
+                                <span style="font-size: 0.7rem;" v-else>{{ $t('statue_disabled') }}</span>
+                            </h2>
                             <span>
                                 <font-awesome-icon :icon="['fas', 'code-branch']" />
                                 {{ $t('scripts_run_' + item.condition) }}{{ $t('scripts_run_trigger') }}
                             </span>
                         </div>
-                        <span v-if="item.enabled">{{ $t('statue_enabled') }}</span>
-                        <span v-else>{{ $t('statue_disabled') }}</span>
-                    </div>
-                    <div>
-                        <font-awesome-icon @click="item.enabled = !item.enabled;updateSave();" :icon="['fas', 'check']" />
-                        <font-awesome-icon :icon="['fas', 'edit']" @click="selectItem(item)" />
-                        <font-awesome-icon :icon="['fas', 'trash-alt']" @click="remove(item.title)" />
+                        <div :style="item.enabled ? 'color: #ed6a5e;' : ''" @click="item.enabled = !item.enabled;updateSave();">
+                            <font-awesome-icon :icon="['fas', item.enabled ? 'stop' : 'play']" />
+                        </div>
                     </div>
                 </div>
             </div>
@@ -56,8 +56,9 @@
                     <span>{{ $t('scripts_run_save') }}</span>
                 </button>
                 <button class="ss-button"
-                    @click="editScript = false">
-                    <font-awesome-icon :icon="['fas', 'times']" />
+                    @click="editScript = false;remove(select);">
+                    <font-awesome-icon v-if="select == ''" :icon="['fas', 'times']" />
+                    <font-awesome-icon v-else :icon="['fas', 'trash-alt']" />
                 </button>
             </div>
             <prism-editor class="editor" v-model="script"
@@ -88,6 +89,7 @@ import { highlight, languages } from 'prismjs'
 
 import { getMsgData } from '@/function/utils/msgUtil'
 import { Logger, PopInfo, PopType } from '@/function/base'
+import { MsgElem, MsgInfoElem } from '@/function/elements/information'
 
 export default defineComponent({
     name: 'ViewScripts',
@@ -109,8 +111,8 @@ export default defineComponent({
             }[],
             select: '',
 
-            message: null as any | null,
-            msgInfo: null as {[key: string]: any} | null,
+            message: null as MsgElem | null,
+            msgInfo: null as MsgInfoElem | null,
             isMe: false
         }
     },
@@ -246,17 +248,19 @@ export default defineComponent({
         this.$watch(() => runtimeData.watch.newMsg, () => {
             if(runtimeData.sysConfig.append_scripts) {
                 this.message = runtimeData.watch.newMsg
-                // FIXME 这儿没有判断是不是自身返回的消息，注意谨防死循环
-                const infoList = getMsgData('message_info', this.message, runtimeData.jsonMap.message_info)
-                if(infoList != undefined) {
-                    this.msgInfo = infoList[0]
-                }
-                if(this.msgInfo) {
-                    this.isMe = Number(this.msgInfo.sender) == Number(runtimeData.loginInfo.uin)
-                } else {
-                    this.isMe = false
+                if(this.message) {
+                    // FIXME 这儿没有判断是不是自身返回的消息，注意谨防死循环
+                    const infoList = getMsgData('message_info', this.message, runtimeData.jsonMap.message_info)
+                    if(infoList != undefined) {
+                        this.msgInfo = infoList[0]
+                    }
+                    if(this.msgInfo) {
+                        this.isMe = Number(this.msgInfo.sender) == Number(runtimeData.loginInfo.uin)
+                    } else {
+                        this.isMe = false
+                    }
+                    this.onEvent('message')
                 }
-                this.onEvent('message')
             }
         })
         // 监听好友/群列表刷新
@@ -325,15 +329,40 @@ export default defineComponent({
     display: flex;
     padding: 10px;
 }
+.list-body > div > div:last-child > div:last-child {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    height: 30px;
+    background: var(--color-card-2);
+    border-radius: 100%;
+    margin-right: 10px;
+}
+.list-body > div.selected > div:last-child > div:last-child {
+    background: #ffffffca;
+}
+.list-body > div > div:last-child > div:last-child svg {
+    color: var(--color-font-1);
+    font-size: 0.7rem;
+}
+.list-body > div.selected > div:last-child > div:last-child svg {
+    color: var(--color-main);
+}
+
 .list-body > div.selected {
     background: var(--color-main);
 }
+.list-body > div.selected span,
 .list-body > div.selected h2 {
     color: var(--color-font-r);
 }
-.list-body > div.selected span,
-.list-body > div.selected > div:last-child > svg {
-    color: var(--color-font-1-r);
+.list-body > div.selected span > svg {
+    color: var(--color-font-r);
+}
+.list-body > div.selected svg {
+    color: var(--color-font-1);
 }
 .list-body h2 {
     font-size: 1rem;
@@ -356,6 +385,7 @@ export default defineComponent({
     flex: 1;
 }
 .list-body > div > div:last-child {
+    align-items: center;
     justify-content: space-evenly;
     margin-top: 5px;
     display: flex;
diff --git a/src/pages/chat-view/SystemNotice.vue b/src/pages/chat-view/SystemNotice.vue
index 31bda3aa..13e35af4 100644
--- a/src/pages/chat-view/SystemNotice.vue
+++ b/src/pages/chat-view/SystemNotice.vue
@@ -95,7 +95,7 @@ export default defineComponent({
          * @param notice 申请信息
          * @param deal 同意 / 拒绝
          */
-        dealFriend(notice:any, deal: boolean) {
+        dealFriend(notice:{ flag: string }, deal: boolean) {
             Connector.send(
                 'set_friend_add_request',
                 {
@@ -111,7 +111,7 @@ export default defineComponent({
          * @param notice 申请信息
          * @param deal 同意 / 拒绝
          */
-        dealGroupAdd(notice:any, deal: boolean) {
+        dealGroupAdd(notice: { flag: string, sub_type: string }, deal: boolean) {
             Connector.send(
                 'set_group_add_request',
                 {
diff --git a/src/pages/options/OptDev.vue b/src/pages/options/OptDev.vue
index 565dea84..399425d7 100644
--- a/src/pages/options/OptDev.vue
+++ b/src/pages/options/OptDev.vue
@@ -268,7 +268,7 @@ export default defineComponent({
             info += `    Browser Name     -> ${browser.name}\n`
             info += `    Browser Version  -> ${browser.version}\n`
             if(addInfo) {
-                const get = addInfo as {[key: string]: any}
+                const get = addInfo as { [key: string]: [string, string] }
                 Object.keys(get).forEach((name: string) => {
                     info += `    ${get[name][0]} -> ${get[name][1]}\n`
                 })