From 9f44133926a0398c284cea38d2897befba4ce01b Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Fri, 23 Aug 2024 15:23:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=87=AA=E7=94=B1=20:spa?=
 =?UTF-8?q?rkles:=20=E7=8E=B0=E5=9C=A8=E4=BD=A0=E5=8F=AF=E4=BB=A5=E5=9C=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E4=B8=AD=E5=8F=B3=E5=87=BB?=
 =?UTF-8?q?=E7=BE=A4=E7=BB=84=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E4=BA=86=EF=BC=81=20:lipstick:=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E5=9C=A8=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF=20:lipst?=
 =?UTF-8?q?ick:=20=E8=B0=83=E6=95=B4=E7=AA=97=E5=8F=A3=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=20:bug:=20=E4=BF=AE=E6=AD=A3=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E8=BF=9E=E6=8E=A5=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E7=9A=84=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=20:bug:?=
 =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E5=90=8E=E7=AB=AF=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=87=AA=E5=8A=A8=E9=87=8D=E8=BF=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E7=BC=BA=E5=A4=B1=20:bug:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E8=AE=BE=E7=BD=AE=E8=8E=B7=E5=8F=96=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=9C=A8=E5=A4=84=E7=90=86=20json=20=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E6=97=B6=E7=9A=84=E4=B8=8D=E7=BB=9F=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=20:art:=20=E5=AF=B9=20Napcat=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E8=AF=86=E5=88=AB=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/view.css              |  5 +++
 src/assets/l10n/zh-CN.json           |  2 ++
 src/background.ts                    |  4 +--
 src/function/connect.ts              | 11 ++++---
 src/function/electron/connector.ts   | 30 +++++++++++++++---
 src/function/msg.ts                  | 13 ++++++--
 src/function/option.ts               |  7 ++++-
 src/main.ts                          |  8 ++---
 src/pages/Messages.vue               | 46 ++++++++++++++++++++++++++++
 src/pages/Scripts.vue                | 24 ++-------------
 src/pages/chat-view/SystemNotice.vue |  4 +--
 11 files changed, 113 insertions(+), 41 deletions(-)

diff --git a/src/assets/css/view.css b/src/assets/css/view.css
index 6e69f059..9eb2c255 100644
--- a/src/assets/css/view.css
+++ b/src/assets/css/view.css
@@ -389,6 +389,10 @@ textarea:focus {
     background: var(--color-main);
     color: var(--color-font-r);
 }
+.friend-body.active > svg {
+    background: var(--color-card-2);
+    color: var(--color-main);
+}
 .friend-body.onmenu,
 .friend-body:hover {
     background: var(--color-card-2) !important;
@@ -404,6 +408,7 @@ textarea:focus {
     width: 50px;
 }
 .friend-body > svg {
+    transition: background .3s, color .3s;
     background: var(--color-main);
     color: var(--color-font-1-r);
     pointer-events: none;
diff --git a/src/assets/l10n/zh-CN.json b/src/assets/l10n/zh-CN.json
index 61c36dd2..cad09ba6 100644
--- a/src/assets/l10n/zh-CN.json
+++ b/src/assets/l10n/zh-CN.json
@@ -341,6 +341,8 @@
   "array_code": "Array 数组",
   "chat_pic": "图片",
   "log_con_backend": "使用后端连接模式",
+  "list_menu_notice": "开启通知",
+  "list_menu_notice_close": "关闭通知",
 
   "menu_about": "关于",
   "menu_update": "检查更新…",
diff --git a/src/background.ts b/src/background.ts
index 9f09c945..edebe35a 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -46,8 +46,8 @@ async function createWindow() {
     Menu.setApplicationMenu(null)
     // 创建窗口
     const mainWindowState = windowStateKeeper({
-        defaultWidth: 1200,
-        defaultHeight: 800
+        defaultWidth: 850,
+        defaultHeight: 530
     })
     const store = new Store()
     let windowConfig = {
diff --git a/src/function/connect.ts b/src/function/connect.ts
index a16d16ce..8495e718 100644
--- a/src/function/connect.ts
+++ b/src/function/connect.ts
@@ -200,11 +200,12 @@ export class Connector {
             }
         } else {
             if(websocket) websocket.send(json)
-            if (Option.get('log_level') === 'debug') {
-                logger.debug('PUT：' + json)
-            } else {
-                logger.add(LogType.WS, 'PUT：' + json)
-            }
+        }
+
+        if (Option.get('log_level') === 'debug') {
+            logger.debug('PUT：' + json)
+        } else {
+            logger.add(LogType.WS, 'PUT：' + json)
         }
     }
 }
diff --git a/src/function/electron/connector.ts b/src/function/electron/connector.ts
index 60b5f4f1..7ab9f7a8 100644
--- a/src/function/electron/connector.ts
+++ b/src/function/electron/connector.ts
@@ -13,6 +13,7 @@ export class Connector {
 
     private win: BrowserWindow
     private websocket: WebSocket | undefined
+    private reconnectTimes = 0
 
     constructor(win: BrowserWindow) {
         this.logger.level = logLevel
@@ -39,6 +40,7 @@ export class Connector {
         }
 
         this.websocket.onopen = () => {
+            this.reconnectTimes = 0
             this.logger.info('已成功连接到', url)
             this.win.webContents.send('onebot:onopen', { address: url, token: token })
         }
@@ -59,6 +61,8 @@ export class Connector {
             this.win.webContents.send('onebot:onmessage', e.data)
         }
         this.websocket.onclose = (e) => {
+            this.websocket = undefined
+
             this.logger.info('连接已关闭，代码：', e.code)
             if(e.code != 1006 && e.code != 1015) {
                 // 除了需要重连的情况，其他情况都直接常规处理
@@ -68,10 +72,28 @@ export class Connector {
                     address: url,
                     token: token
                 })
-            } else if(e.code == 1015) {
-                // TSL 连接失败，尝试使用非加密连接
-                this.logger.warn('连接失败，尝试使用非加密连接...')
-                this.connect(url.replace('wss://', 'ws://'), token)
+            } else {
+                this.win.webContents.send('onebot:onclose', {
+                    code: -1,
+                    message: e.reason,
+                    address: url,
+                    token: token
+                })
+            }
+            if(this.reconnectTimes < 5) {
+                setTimeout(() => {
+                    if(e.code == 1015) {
+                        // TSL 连接失败，尝试使用非加密连接
+                        this.websocket = undefined
+                        this.logger.warn('连接失败，尝试使用非加密连接...')
+                        this.connect(url.replace('wss://', 'ws://'), token)
+                    } else if(e.code == 1006) {
+                        // 连接失败，尝试重连
+                        this.logger.warn('连接失败，尝试重连...')
+                        this.connect(url, token)
+                    }
+                    this.reconnectTimes ++
+                }, 1500)
             }
         }
         this.websocket.onerror = (e) => {
diff --git a/src/function/msg.ts b/src/function/msg.ts
index cb2fc40d..ab35134a 100644
--- a/src/function/msg.ts
+++ b/src/function/msg.ts
@@ -921,8 +921,17 @@ function newMsg(data: any) {
         if (data.sub_type === 'group') {
             data.sender.nickname = data.sender.user_id
         }
-        // (发送者不是自己 && (在特别关心列表里 || 发送者不是群组 || 群组 AT || 群组 AT 全体 || 打开了通知全部消息)) 这些情况需要进行新消息处理
-        if (sender != loginId && sender != 0 && (isImportant || data.message_type !== 'group' || data.atme || data.atall || Option.get('notice_all') === true)) {
+        // 检查群组有没有开启通知
+        let isGroupNotice = false
+        if(data.message_type === 'group') {
+            const noticeInfo = Option.get('notice_group') ?? {}
+            const list = noticeInfo[runtimeData.loginInfo.uin]
+            if(list) {
+                isGroupNotice = list.indexOf(id) >= 0
+            }
+        }
+        // (发送者不是自己 && (在特别关心列表里 || 发送者不是群组 || 群组 AT || 群组 AT 全体 || 群组开启了通知 || 打开了通知全部消息)) 这些情况需要进行新消息处理
+        if (sender != loginId && sender != 0 && (isImportant || data.message_type !== 'group' || data.atme || data.atall || isGroupNotice || Option.get('notice_all') === true)) {
             // (发送者没有被打开 || 窗口没有焦点 || 窗口被最小化 || 在特别关心列表里) 这些情况需要进行消息通知
             if (id !== showId || !document.hasFocus() || document.hidden || isImportant) {
                 // 准备消息内容
diff --git a/src/function/option.ts b/src/function/option.ts
index 267f3865..8cd7d1f5 100644
--- a/src/function/option.ts
+++ b/src/function/option.ts
@@ -365,7 +365,12 @@ export function get(name: string): any {
         const names = Object.keys(cacheConfigs)
         for (let i = 0; i < names.length; i++) {
             if (names[i] === name) {
-                return cacheConfigs[names[i]]
+                const get = cacheConfigs[names[i]]
+                try {
+                    return JSON.parse(get)
+                } catch(e: unknown) {
+                    return get
+                }
             }
         }
     }
diff --git a/src/main.ts b/src/main.ts
index ef6d39a9..dc937ecf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -56,12 +56,12 @@ app.mount('#app')
 export default app
 export const uptime = new Date().getTime()
 
+console.log(' _____ _____ _____ _____ __ __  \n' +
+            '|   __|_   _|  _  |  _  |  |  | \n' +
+            '|__   | | | |     |   __|-   -| \n' +
+            '|_____| |_| |__|__|__|  |__|__| CopyRight © Stapx Steve')
 const strList = ['VERSION', 'WELCOME', 'HELLO']
 const colorList = ['50534f', 'f9a633', '8076a3', 'f0a1a8', '92aa8a', '606E7A', '7abb7e', 'b573f7', 'ff5370', '99b3db', '677480']
 const color = colorList[Math.floor(Math.random() * colorList.length)]
 const str = strList[Math.floor(Math.random() * strList.length)]
 console.log(`%c${str}%c Stapxs QQ Lite - ${packageInfo.version} ( ${process.env.NODE_ENV} ) `, `font-weight:bold;background:#${color};color:#fff;border-radius:7px 0 0 7px;display:inline-block;padding:7px 14px;margin:7px 0 7px 7px;`, 'background:#F8F9FA;color:#000;border-radius:0 7px 7px 0;display:inline-block;padding:7px 14px;margin:7px 7px 7px 0;');
-console.log(' _____ _____ _____ _____ __ __  \n' +
-            '|   __|_   _|  _  |  _  |  |  | \n' +
-            '|__   | | | |     |   __|-   -| \n' +
-            '|_____| |_| |__|__|__|  |__|__| CopyRight © Stapx Steve')
diff --git a/src/pages/Messages.vue b/src/pages/Messages.vue
index c32ef645..34c5eb15 100644
--- a/src/pages/Messages.vue
+++ b/src/pages/Messages.vue
@@ -31,6 +31,8 @@
                     <li icon="fa-solid fa-grip-lines" id="canceltop">{{ $t('list_menu_canceltop') }}</li>
                     <li icon="fa-solid fa-trash-can" id="remove">{{ $t('list_menu_remove') }}</li>
                     <li icon="fa-solid fa-check-to-slot" id="readed">{{ $t('list_menu_readed') }}</li>
+                    <li icon="fa-solid fa-volume-high" id="notice_open">{{ $t('list_menu_notice') }}</li>
+                    <li icon="fa-solid fa-volume-xmark" id="notice_close">{{ $t('list_menu_notice_close') }}</li>
                 </ul>
             </BcMenu>
             <div id="message-list-body" :class="(runtimeData.tags.openSideBar ? 'open' : '')" style="overflow-y: scroll;">
@@ -224,11 +226,47 @@ export default defineComponent({
                     }
                     case 'top': this.saveTop(item, true); break
                     case 'canceltop': this.saveTop(item, false); break
+                    case 'notice_open': {
+                        const noticeInfo = Option.get('notice_group') ?? {}
+                        const list = noticeInfo[runtimeData.loginInfo.uin]
+                        if(list) {
+                            list.push(item.group_id)
+                        } else {
+                            noticeInfo[runtimeData.loginInfo.uin] = [item.group_id]
+                        }
+                        Option.save('notice_group', noticeInfo)
+                        break
+                    }
+                    case 'notice_close': {
+                        const noticeInfo = Option.get('notice_group') ?? {}
+                        const list = noticeInfo[runtimeData.loginInfo.uin]
+                        if(list) {
+                            const index = list.indexOf(item.group_id)
+                            if(index >= 0) {
+                                list.splice(index, 1)
+                            }
+                        }
+                        Option.save('notice_group', noticeInfo)
+                        break
+                    }
                 }
             }
             this.menu.select = undefined
         },
 
+        /**
+         * 判断是否通知群消息
+         * @param id 群 ID
+         */
+        canGroupNotice(id: number) {
+            const noticeInfo = Option.get('notice_group') ?? {}
+            const list = noticeInfo[runtimeData.loginInfo.uin]
+            if(list) {
+                return list.indexOf(id) >= 0
+            }
+            return false
+        },
+
         /**
          * 保存置顶信息
          * @param event 点击事件
@@ -297,6 +335,14 @@ export default defineComponent({
             if(item.always_top) {
                 info.list = ['canceltop', 'readed']
             }
+            // 是群的话显示通知设置
+            if(item.group_id) {
+                if(this.canGroupNotice(item.group_id)) {
+                    info.list.push('notice_close')
+                } else {
+                    info.list.push('notice_open')
+                }
+            }
             this.listMenu = info
             this.menu.select = item
         },
diff --git a/src/pages/Scripts.vue b/src/pages/Scripts.vue
index 49cd1c0a..c792aa06 100644
--- a/src/pages/Scripts.vue
+++ b/src/pages/Scripts.vue
@@ -89,6 +89,7 @@ import { highlight, languages } from 'prismjs'
 
 import { getMsgData } from '@/function/utils/msgUtil'
 import { Logger, PopInfo, PopType } from '@/function/base'
+import { getRaw, save } from '@/function/option'
 
 export default defineComponent({
     name: 'ViewScripts',
@@ -166,13 +167,7 @@ export default defineComponent({
         },
         updateSave() {
             const saveJson = JSON.stringify(this.savedList)
-            if(runtimeData.tags.isElectron) {
-                runtimeData.reader?.send('sys:store', {
-                    key: 'scripts', value: saveJson
-                })
-            } else {
-                localStorage.setItem('scripts', saveJson)
-            }
+            save('scripts', saveJson)
         },
         save() {
             this.editScript = false
@@ -229,20 +224,7 @@ export default defineComponent({
             }
         })
         // 读取保存的脚本
-        const electron = window.require('electron')
-        let data = null
-        if(electron) {
-            const reader = electron.ipcRenderer
-            if(reader) data = await reader.invoke('sys:getStore', 'scripts')
-        }
-        if(data) {
-            this.savedList = JSON.parse(data)
-        } else {
-            data = localStorage.getItem('scripts')
-            if(data) {
-                this.savedList = JSON.parse(data)
-            }
-        }
+        this.savedList = JSON.parse(decodeURIComponent(getRaw('scripts'))) ?? []
         // 监听消息更改
         this.$watch(() => runtimeData.watch.newMsg, () => {
             if(runtimeData.sysConfig.append_scripts) {
diff --git a/src/pages/chat-view/SystemNotice.vue b/src/pages/chat-view/SystemNotice.vue
index 13e35af4..97342923 100644
--- a/src/pages/chat-view/SystemNotice.vue
+++ b/src/pages/chat-view/SystemNotice.vue
@@ -15,7 +15,7 @@
         </div>
         <div class="sys-not-list">
             <template v-for="(notice, index) in runtimeData.systemNoticesList" :key="'sysNot-' + index">
-                <div v-if="notice.request_type == 'friend' && notice.sub_type == 'add'"
+                <div v-if="notice.request_type == 'friend'"
                     class="sys_not_new_friend">
                     <span>{{ $t('sys_notice_new_friend') }}</span>
                     <div>
@@ -37,7 +37,7 @@
                         </div>
                     </div>
                 </div>
-                <div v-else-if="notice.request_type == 'group' && notice.sub_type == 'add'"
+                <div v-else-if="notice.request_type == 'group'"
                     class="sys_not_new_friend">
                     <span>{{ $t('sys_notice_new_group_nmember') }}</span>
                     <div>

From 88cbb782d634f91b79da6506b7cec1b8142cdbb2 Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Fri, 23 Aug 2024 18:30:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=98=AF=20BUG=20=E6=80=BB=E4=BC=9A?=
 =?UTF-8?q?=E8=A2=AB=E4=BF=AE=E6=8E=89=E7=9A=84.png=20:art:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20options=20=E4=BF=9D=E5=AD=98=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AF=B9=20object=20=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20:bug:=20=E6=B7=BB=E5=8A=A0=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=90=8E=E5=88=97=E8=A1=A8=E6=9C=AA=E8=A2=AB?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=20:bug:=20=E5=90=8E=E7=AB=AF=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=89=8D=E7=AB=AF=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=90=8E=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9E=20:bug:=20=E6=B6=88=E6=81=AF=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=9C=A8=E6=B7=BB=E5=8A=A0=E5=9B=9E=E5=BA=94=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B3=E4=BE=A7=E5=87=BA=E7=95=8C=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E7=94=B1=20b1c880b=20=E6=8D=9F?=
 =?UTF-8?q?=E5=9D=8F=20:bug:=20=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=B3=E5=87=BB=E8=8F=9C=E5=8D=95=E5=BA=95=E9=83=A8=E5=87=BA?=
 =?UTF-8?q?=E7=95=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  1 +
 src/assets/css/view.css            |  2 +-
 src/components/FacePan.vue         |  8 ++++++--
 src/function/electron/connector.ts |  5 +++++
 src/function/option.ts             | 13 +++++--------
 src/pages/Chat.vue                 | 21 ++++++++++++---------
 src/pages/Messages.vue             | 22 ++++++++++++++++++++++
 7 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 964c0171..a6db6136 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
+    "clear": "rm -rf dist && rm -rf dist_electron",
     "lint:fix": "vue-cli-service lint --fix",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
diff --git a/src/assets/css/view.css b/src/assets/css/view.css
index 9eb2c255..55495ce7 100644
--- a/src/assets/css/view.css
+++ b/src/assets/css/view.css
@@ -505,7 +505,7 @@ textarea:focus {
     padding: 10px;
 }
 .msg-menu-body.topOut {
-    transition: transform .1s, margin-top .1s;
+    transition: transform .1s, margin-top .2s;
 }
 .msg-menu-body.show {
     transform: scaleY(1);
diff --git a/src/components/FacePan.vue b/src/components/FacePan.vue
index 5a9d8387..50fa1088 100644
--- a/src/components/FacePan.vue
+++ b/src/components/FacePan.vue
@@ -84,13 +84,13 @@ export default defineComponent({
         },
 
         getStoreFaceList() {
-            this.storeFace = JSON.parse(decodeURIComponent(Option.getRaw('store_face') || '[]'))
+            this.storeFace = Option.get('store_face') ?? []
         },
         removeMface(data: any) {
             const index = this.storeFace.findIndex((face) => face.emoji_id === data.emoji_id)
             if (index !== -1) {
                 this.storeFace.splice(index, 1)
-                Option.save('store_face', JSON.stringify(this.storeFace))
+                Option.save('store_face', this.storeFace)
             }
         }
     },
@@ -104,6 +104,10 @@ export default defineComponent({
             }
         }
         this.getStoreFaceList()
+        // 监听表情商店列表
+        this.$watch(() => runtimeData.sysConfig.store_face.length, () => {
+            this.getStoreFaceList()
+        })
     }
 })
 </script>
diff --git a/src/function/electron/connector.ts b/src/function/electron/connector.ts
index 7ab9f7a8..b3ded329 100644
--- a/src/function/electron/connector.ts
+++ b/src/function/electron/connector.ts
@@ -37,6 +37,11 @@ export class Connector {
         if(!this.websocket) {
             this.logger.info('正在连接到：', url)
             this.websocket = new WebSocket(url + '?access_token=' + token)
+        } else {
+            // 如果前端发起了连接请求，说明前端在未连接状态；断开已有连接，重新连接
+            // PS：这种情况一般不会发生，大部分情况是因为 debug 模式前端热重载导致的
+            this.websocket.close(1000)
+            this.connect(url, token)
         }
 
         this.websocket.onopen = () => {
diff --git a/src/function/option.ts b/src/function/option.ts
index 8cd7d1f5..367db13c 100644
--- a/src/function/option.ts
+++ b/src/function/option.ts
@@ -318,16 +318,13 @@ function loadOptData(data: { [key: string]: any }) {
             options[key] = value === 'true'
         } else if (value === 'null') {
             options[key] = null
-        } else if (key == 'top_info') {
-            // 特殊处理 top_info
-            try {
-                options[key] = JSON.parse(decodeURIComponent(value))
-            } catch (e) {
-                // 无法解析的数据，初始化为空对象
-                options[key] = {}
-            }
         } else if(typeof value == 'string') {
             options[key] = decodeURIComponent(value)
+            try {
+                options[key] = JSON.parse(options[key])
+            } catch(e: unknown) {
+                //
+            }
         } else {
             options[key] = value
         }
diff --git a/src/pages/Chat.vue b/src/pages/Chat.vue
index f0862c11..6f5d3a07 100644
--- a/src/pages/Chat.vue
+++ b/src/pages/Chat.vue
@@ -129,7 +129,7 @@
                 <!-- 回复指示器 -->
                 <div :class="tags.isReply ? 'replay-tag show' : 'replay-tag'">
                     <font-awesome-icon :icon="['fas', 'reply']" />
-                    <span>{{ selectedMsg === null ? '' : (selectedMsg.sender.nickname + ': ' + (selectedMsg.raw_message ?? fun.getMsgRawTxt(selectedMsg.message)))
+                    <span>{{ selectedMsg === null ? '' : (selectedMsg.sender.nickname + ': ' + fun.getMsgRawTxt(selectedMsg.message))
                     }}</span>
                     <div @click="cancelReply"><font-awesome-icon :icon="['fas', 'xmark']" /></div>
                 </div>
@@ -799,10 +799,15 @@ export default defineComponent({
                 menu.style.marginLeft = pointX + 'px'
                 menu.style.marginTop = pointY + 'px'
                 // 出界判定
-                const menuWidth = menu.clientWidth
+                let menuWidth = menu.clientWidth
+                if(this.tags.menuDisplay.showRespond) {
+                    // 如果有回应功能，获取回应功能的宽度；它比菜单长
+                    const item = menu.children[0] as HTMLDivElement
+                    menuWidth = item.clientWidth
+                }
                 const msgWidth = msg.offsetWidth
                 if (pointX + menuWidth > msgWidth + 27) {
-                    menu.style.marginLeft = (msgWidth + 27 - menuWidth) + 'px'
+                    menu.style.marginLeft = (msgWidth + 7 - menuWidth) + 'px'
                 }
                 // 显示菜单
                 this.tags.showMsgMenu = true
@@ -811,12 +816,11 @@ export default defineComponent({
                     // 出界判定
                     const menuHeight = menu.clientHeight
                     const bodyHeight = document.body.clientHeight
-                    if (pointY + menuHeight > bodyHeight + 10) {
+                    if (pointY + menuHeight > bodyHeight - 20) {
                         menu.classList.add('topOut')
                         menu.style.marginTop = (bodyHeight - menuHeight - 10) + 'px'
-                        // menu.classList.remove('topOut')
                     }
-                }, 90)
+                }, 100)
                 // 设置消息背景
                 this.tags.openedMenuMsg = msg
                 msg.style.background = '#00000008'
@@ -971,8 +975,7 @@ export default defineComponent({
             const msg = this.selectedMsg
             if (msg !== null) {
             const mface = msg.message[0]
-                const storeFace = option.get('store_face') ?? '[]'
-                const storeFaceList = JSON.parse(storeFace)
+                const storeFaceList = option.get('store_face') ?? []
                 const face = storeFaceList.find((item: any) => {
                     return item.emoji_package_id == mface.emoji_package_id && 
                         item.emoji_id == mface.emoji_id
@@ -981,7 +984,7 @@ export default defineComponent({
                     popInfo.add(PopType.INFO, this.$t('pop_chat_msg_menu_store_face_exist'))
                 } else {
                     storeFaceList.push(mface)
-                    option.save('store_face', JSON.stringify(storeFaceList))
+                    option.save('store_face', storeFaceList)
                     popInfo.add(PopType.INFO, this.$t('pop_chat_msg_menu_store_face_success'))
                 }
             }
diff --git a/src/pages/Messages.vue b/src/pages/Messages.vue
index 34c5eb15..535a801c 100644
--- a/src/pages/Messages.vue
+++ b/src/pages/Messages.vue
@@ -212,6 +212,12 @@ export default defineComponent({
          * @param id 选择的菜单 ID
          */
         listMenuClose(id: string) {
+            const menu = document.getElementById('msg-menu-view-messages-menu')?.children[1] as HTMLDivElement
+            if(menu) {
+                setTimeout(() => {
+                    menu.style.transition = 'transform .1s'
+                }, 200)
+            }
             this.listMenu.show = false
             const item = this.menu.select
             if(id) {
@@ -345,6 +351,22 @@ export default defineComponent({
             }
             this.listMenu = info
             this.menu.select = item
+            // 出界处理
+            setTimeout(() => {
+                const menu = document.getElementById('msg-menu-view-messages-menu')?.children[1] as HTMLDivElement
+                if(menu) {
+                        menu.style.transition = 'margin .2s, transform .1s'
+                    const hight = menu.clientHeight
+                    const top = menu.getBoundingClientRect().top
+                    const docHight = document.documentElement.clientHeight
+                    // 出界高度
+                    const dtHight = ( hight + top ) - docHight + 20
+                    if(dtHight > 0) {
+                        menu.style.marginTop = (docHight - hight - 30)  + 'px'
+                    }
+
+                }
+            }, 100)
         },
 
         showMenuStart(event: TouchEvent, item: (UserFriendElem & UserGroupElem)) {

From 909e01deaa4bb5dfdfa9e95c01a182ad6686a354 Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Tue, 27 Aug 2024 17:58:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=8B=82=E8=BD=B0=E6=BB=A5=E7=82=B8=20?=
 =?UTF-8?q?=E2=9C=A8=20=E6=94=AF=E6=8C=81=E7=A6=81=E8=A8=80=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=A6=81=E7=94=A8=20<-=20#121=20?=
 =?UTF-8?q?=E2=9C=A8=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=8C=89=E9=92=AE=20<-=20#121=20=E2=9C=A8=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=9D=9E=E5=88=86=E9=A1=B5=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=B6=88=E6=81=AF=20<-=20#120=20=F0=9F=8E=A8?=
 =?UTF-8?q?=20=E5=B0=86=20UserFriendElem=20=E5=92=8C=20UserGroupElem=20?=
 =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E5=87=BA=E4=BA=86=E7=88=B6=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E4=BA=86=E7=B1=BB=E5=85=83=E7=B4=A0=E5=86=99?=
 =?UTF-8?q?=E5=8F=8D=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98=20=F0=9F=92=84=20?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E4=BA=86=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=20=F0=9F=92=84=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=9C=AA=E4=B8=8A=E4=B8=8B=E5=B1=85=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=F0=9F=90=9B=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=BF=9E=E6=8E=A5=E6=A8=A1=E5=BC=8F=20SSL=20?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=F0=9F=90=9B=20=E4=BF=AE=E6=AD=A3=E5=9C=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5=E5=90=8E=E6=9C=AA=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=88=97=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98=20<-=20#?=
 =?UTF-8?q?121?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/assets/css/append/append_new.css          | 16 ++++
 src/assets/css/chat.css                       | 58 ++++++++++++-
 src/assets/css/msg.css                        |  4 +
 src/assets/css/view.css                       |  2 +
 src/assets/l10n/en-US.json                    |  2 -
 src/assets/l10n/zh-CAT.json                   |  2 -
 src/assets/l10n/zh-CN.json                    | 16 +++-
 src/assets/l10n/zh-TW.json                    |  2 -
 src/assets/l10n/zh-YUE.json                   |  2 -
 src/assets/pathMap/NapCat.Onebot.yaml         | 19 +++++
 src/components/NoticeBody.vue                 | 68 +++++++++++-----
 src/function/connect.ts                       |  3 +
 src/function/electron/connector.ts            | 15 ++--
 src/function/elements/information.ts          | 26 +++---
 src/function/msg.ts                           | 54 +++++++++++--
 src/function/utils/appUtil.ts                 |  5 +-
 src/function/utils/systemUtil.ts              | 25 ++++++
 src/pages/Chat.vue                            | 12 +--
 .../Chat\345\274\271\345\271\225.vue"         |  5 +-
 .../Chat\347\273\210\347\253\257.vue"         |  5 +-
 src/pages/chat-view/SystemNotice.vue          | 81 +++++++++----------
 src/pages/options/OptDev.vue                  |  4 +-
 src/pages/options/OptInfo.vue                 | 41 ++++++++++
 24 files changed, 348 insertions(+), 121 deletions(-)

diff --git a/package.json b/package.json
index a6db6136..e2b793b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stapxs-qq-lite",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "private": false,
   "author": "Stapx Steve [林槐]",
   "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，使用 Vue 重制的全新版本。",
diff --git a/src/assets/css/append/append_new.css b/src/assets/css/append/append_new.css
index 9c02066b..ece2a7ef 100644
--- a/src/assets/css/append/append_new.css
+++ b/src/assets/css/append/append_new.css
@@ -78,6 +78,9 @@
     height: 30px;
     width: 30px;
 }
+.friend-body > div:nth-child(1) {
+    height: 34px;
+}
 .friend-body > div p {
     font-size: 0.8rem;
 }
@@ -687,6 +690,19 @@
     font-size: 0.8rem;
 }
 
+.sys-not-list > div > div:first-child img {
+    width: 40px;
+    height: 40px;
+}
+.sys-not-list > div > div:first-child a {
+    font-size: 0.75rem;
+}
+.sys-not-list > div > div:last-child button {
+    width: 70px;
+    height: 30px;
+    font-size: 0.75rem;
+}
+
 @media (max-width: 700px) {
     .main-body > ul {
         background: var(--color-card-2) !important;
diff --git a/src/assets/css/chat.css b/src/assets/css/chat.css
index 1d122ab3..1df4e935 100644
--- a/src/assets/css/chat.css
+++ b/src/assets/css/chat.css
@@ -207,6 +207,15 @@ input {
     width: 100%;
     border: 0;
 }
+.chat-pan > div.more > div:nth-child(2) > div > form > input:disabled,
+.chat-pan > div.more > div:nth-child(2) > div > form > textarea:disabled {
+    background: var(--color-card);
+    outline: 1px solid var(--color-card-2);
+    color: var(--color-font-2);
+    opacity: 0.7;
+    text-align: center;
+    font-size: 0.8rem;
+}
 .chat-pan > div.more > div:nth-child(2) > div > div {
     border-radius: 7px;
     min-height: 40px;
@@ -281,11 +290,58 @@ input {
 }
 
 .sys-not-list {
+    margin-top: 10px;
+}
+.sys-not-list > div {
     background: var(--color-card-1);
+    margin-bottom: 10px;
     border-radius: 7px;
-    margin-top: 10px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
     padding: 10px;
 }
+.sys-not-list > div > div:first-child {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex: 1;
+}
+.sys-not-list > div > div:first-child img {
+    width: 50px;
+    height: 50px;
+    border-radius: 7px;
+    border: 2px solid var(--color-card-2);
+    margin-right: 10px;
+}
+.sys-not-list > div > div:first-child div {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-start;
+    text-align: left;
+}
+.sys-not-list > div > div:first-child span {
+    color: var(--color-main);
+    font-weight: bold;
+}
+.sys-not-list > div > div:first-child a {
+    color: var(--color-font);
+    font-size: 0.9rem;
+}
+.sys-not-list > div > div:first-child a:last-child {
+    color: var(--color-font-2);
+}
+.sys-not-list > div > div:last-child button {
+    margin-right: 10px;
+    width: 90px;
+    height: 35px;
+    font-size: 0.9rem;
+}
+.sys-not-list > div > div:last-child button:first-child {
+    background: var(--color-card-2);
+    color: var(--color-font-1);
+}
 
 .more-detail {
     transition: height .3s;
diff --git a/src/assets/css/msg.css b/src/assets/css/msg.css
index 0dad8820..ceaa2121 100644
--- a/src/assets/css/msg.css
+++ b/src/assets/css/msg.css
@@ -457,6 +457,10 @@
 .note-base > a {
     color: var(--color-font);
 }
+.note-ban > a {
+    color: var(--color-main);
+    font-weight: bold;
+}
 .note-time {
     color: var(--color-font-2) !important;
     display: block;
diff --git a/src/assets/css/view.css b/src/assets/css/view.css
index 55495ce7..6b706243 100644
--- a/src/assets/css/view.css
+++ b/src/assets/css/view.css
@@ -384,6 +384,7 @@ textarea:focus {
     border-radius: 7px;
     transform: translate(0, 0);
     transition: background .2s, color .2s, transform .2s;
+    align-items: center;
 }
 .friend-body.active {
     background: var(--color-main);
@@ -423,6 +424,7 @@ textarea:focus {
     overflow: hidden;
 }
 .friend-body > div:nth-child(1) {
+    height: 54px;
     flex: unset;
     width: 4px;
     background: var(--color-main);
diff --git a/src/assets/l10n/en-US.json b/src/assets/l10n/en-US.json
index 667d165e..f18fef7b 100644
--- a/src/assets/l10n/en-US.json
+++ b/src/assets/l10n/en-US.json
@@ -215,7 +215,6 @@
   "option_account_lnick": "Bio",
   "option_account_lnick_tip": "Write something about you here",
   "list_system_notice": "System Messages",
-  "sys_notice_new_friend_from": "Friend source: ",
   "option_dev_debug": "Output debugging info",
   "option_dev_debug_tip": "Helps you figure out the version you're on.",
   "btn_yes": "OK",
@@ -260,7 +259,6 @@
   "chat_chat_info_silence_all_tip": "Mute all members except the owner and admins in the group",
   "btn_accept": "Agree",
   "btn_reject": "Decline",
-  "sys_notice_new_friend": "New friend request",
   "sys_notice": "System Messages",
   "chat_msg_menu_remove": "Remove from group",
   "sys_notice_new_group_nmember": "Join request",
diff --git a/src/assets/l10n/zh-CAT.json b/src/assets/l10n/zh-CAT.json
index 66387239..4052d670 100644
--- a/src/assets/l10n/zh-CAT.json
+++ b/src/assets/l10n/zh-CAT.json
@@ -206,7 +206,6 @@
   "option_account_lnick": "爪印",
   "option_account_lnick_tip": "小猫咪才没有到处写字的坏心思",
   "list_system_notice": "系统猫叫",
-  "sys_notice_new_friend_from": "来源：",
   "option_dev_debug": "输出调试信息",
   "option_dev_debug_tip": "到底用的什么版本呢 ……",
   "btn_yes": "确定",
@@ -251,7 +250,6 @@
   "chat_chat_info_silence_all_tip": "你们是不整点活不开心是吧",
   "btn_accept": "同意",
   "btn_reject": "拒绝",
-  "sys_notice_new_friend": "新猫友",
   "sys_notice": "系统猫话",
   "chat_msg_menu_remove": "移出猫圈",
   "sys_notice_new_group_nmember": "入圈申请",
diff --git a/src/assets/l10n/zh-CN.json b/src/assets/l10n/zh-CN.json
index cad09ba6..b1f5cb7c 100644
--- a/src/assets/l10n/zh-CN.json
+++ b/src/assets/l10n/zh-CN.json
@@ -205,7 +205,6 @@
   "option_account_lnick": "签名",
   "option_account_lnick_tip": "啊吧啊吧（智慧的眼神）",
   "list_system_notice": "系统通知",
-  "sys_notice_new_friend_from": "来源：",
   "option_dev_debug": "输出调试信息",
   "option_dev_debug_tip": "到底用的什么版本呢 ……",
   "btn_yes": "确定",
@@ -251,7 +250,6 @@
   "btn_accept": "同意",
   "btn_reject": "拒绝",
   "btn_reflush": "刷新页面",
-  "sys_notice_new_friend": "新朋友",
   "sys_notice": "系统消息",
   "chat_msg_menu_remove": "移出群聊",
   "sys_notice_new_group_nmember": "入群申请",
@@ -343,6 +341,20 @@
   "log_con_backend": "使用后端连接模式",
   "list_menu_notice": "开启通知",
   "list_menu_notice_close": "关闭通知",
+  "chat_send_msg_watermark_ban": "已被禁言至：{time}",
+  "note_ban_you": "禁言了你",
+  "note_ban_others": "管理员禁言了",
+  "note_unban": "管理员解除了 {name} 的禁言",
+  "days": "天",
+  "hours": "小时",
+  "minutes": "分钟",
+  "seconds": "秒",
+  "you": "你",
+  "exit_group": "退出群聊",
+  "trust_leave_group": "确定要退出群聊吗？",
+  "sys_notice_message": "留言",
+  "sys_notice_new_friend": "请求加为好友",
+  "sys_notice_invite_group": "邀请你加入群聊",
 
   "menu_about": "关于",
   "menu_update": "检查更新…",
diff --git a/src/assets/l10n/zh-TW.json b/src/assets/l10n/zh-TW.json
index 3f16ff40..e8ce9ec2 100644
--- a/src/assets/l10n/zh-TW.json
+++ b/src/assets/l10n/zh-TW.json
@@ -209,7 +209,6 @@
   "option_account_lnick": "簽名檔",
   "option_account_lnick_tip": "啊吧啊吧（充滿智慧的眼神）",
   "list_system_notice": "系統通知",
-  "sys_notice_new_friend_from": "聯絡人來源：",
   "option_dev_debug": "輸出偵錯資訊",
   "option_dev_debug_tip": "我在用的是什麼版本？",
   "btn_yes": "確認",
@@ -254,7 +253,6 @@
   "chat_chat_info_silence_all_tip": "禁止群組所有者和管理員以外的群組成員在群組內傳送訊息",
   "btn_accept": "同意",
   "btn_reject": "拒絕",
-  "sys_notice_new_friend": "新的聯絡人請求",
   "sys_notice": "系統訊息",
   "chat_msg_menu_remove": "移出群組",
   "sys_notice_new_group_nmember": "入群請求",
diff --git a/src/assets/l10n/zh-YUE.json b/src/assets/l10n/zh-YUE.json
index 0bc64232..d22bdd22 100644
--- a/src/assets/l10n/zh-YUE.json
+++ b/src/assets/l10n/zh-YUE.json
@@ -215,7 +215,6 @@
   "option_account_lnick": "Bio",
   "option_account_lnick_tip": "自我介紹資訊",
   "list_system_notice": "系統通知",
-  "sys_notice_new_friend_from": "Friend 來源：",
   "option_dev_debug": "輸出",
   "option_dev_debug_tip": "我喺度用緊乜嘢啊……",
   "btn_yes": "確認",
@@ -260,7 +259,6 @@
   "chat_chat_info_silence_all_tip": "開啓後除咗 group owner 同管理員之外嘅其他人都唔可以講嘢",
   "btn_accept": "同意",
   "btn_reject": "拒絕",
-  "sys_notice_new_friend": "新嘅 friend 請求",
   "sys_notice": "系統訊息",
   "chat_msg_menu_remove": "踢出群組",
   "sys_notice_new_group_nmember": "入群請求",
diff --git a/src/assets/pathMap/NapCat.Onebot.yaml b/src/assets/pathMap/NapCat.Onebot.yaml
index 6c684595..670c8597 100644
--- a/src/assets/pathMap/NapCat.Onebot.yaml
+++ b/src/assets/pathMap/NapCat.Onebot.yaml
@@ -45,6 +45,7 @@ message_list:
     name: get_group_msg_history
     private_name: get_friend_msg_history
     source: $.data.messages[*]
+    pageed: false       # 是否支持分页（id + count 获取）
     type: $.data
     message_type:
         user: private
@@ -115,6 +116,24 @@ group_essence:
         add_digest_nick: /add_digest_nick
         add_digest_time: /add_digest_time
     is_end: $.data.is_end
+# 获取群成员信息
+group_member_info:
+    name: get_group_member_info
+    source: $.data
+    list:
+        group_id: /group_id
+        user_id: /user_id
+        nickname: /nickname
+        card: /card
+        sex: /sex
+        age: /age
+        join_time: /join_time
+        last_sent_time: /last_sent_time
+        is_robot: /is_robot
+        shut_up_timestamp: /shut_up_timestamp
+# 退出群聊
+leave_group:
+    name: set_group_leave
 # 获取收藏表情
 roaming_stamp:
     name: fetch_custom_face
diff --git a/src/components/NoticeBody.vue b/src/components/NoticeBody.vue
index 5fec59ba..89e6716d 100644
--- a/src/components/NoticeBody.vue
+++ b/src/components/NoticeBody.vue
@@ -14,6 +14,22 @@
 
             </div>
         </div>
+        <div class="note-ban note-base" v-if="data.notice_type == 'group_ban'">
+            <template v-if="data.sub_type === 'ban'">
+                <template v-if="isMe(data.user_id)">
+                    <span>{{ $t('chat_member_type_admin') }}</span>
+                    <a>&nbsp;{{ getName(data.operator_id) }}&nbsp;</a>
+                    <span>{{ $t('note_ban_you') }}</span>
+                    <span>&nbsp;{{ fTime(data.duration) }}</span>
+                </template>
+                <template v-else>
+                    <span>{{ $t('note_ban_others') }}</span>
+                    <a>&nbsp;{{ getName(data.user_id) }}&nbsp;</a>
+                    <span>{{ fTime(data.duration) }}</span>
+                </template>
+            </template>
+            <span v-else>{{ $t('note_unban', { name: isMe(data.user_id) ? $t('you') : getName(data.user_id) }) }}</span>
+        </div>
         <div class="note-time note-base" v-if="data.sub_type === 'time'">
             <a>{{
                 Intl.DateTimeFormat(trueLang, getTimeConfig(new Date(data.time * 1000)))
@@ -26,7 +42,7 @@
 <script lang="ts">
 import { defineComponent, ref } from 'vue'
 import { runtimeData } from '@/function/msg'
-import { getTrueLang } from '@/function/utils/systemUtil'
+import { getTimeConfig, getTrueLang } from '@/function/utils/systemUtil'
 
 export default defineComponent({
     name: 'NoticeBody',
@@ -34,28 +50,44 @@ export default defineComponent({
     data() {
         return {
             trueLang: getTrueLang(),
+            getTimeConfig,
             info: ref(this.data) as { [key: string]: any }
         }
     },
     methods: {
-        getTimeConfig(date: Date) {
-            let base = { hour: 'numeric', minute: 'numeric', second: 'numeric' } as Intl.DateTimeFormatOptions
-            const nowDate = new Date()
-            const todayDate = new Date().setHours(0, 0, 0, 0)
-            const paramsDate = date.setHours(0, 0, 0, 0)
-            if(todayDate != paramsDate) {
-                if (nowDate.getFullYear() == date.getFullYear() && nowDate.getMonth() == date.getMonth()) {
-                    base.weekday = 'short'
-                } else if(nowDate.getFullYear() == date.getFullYear()) {
-                    base.day = 'numeric'
-                    base.month = 'short'
-                } else {
-                    base.day = 'numeric'
-                    base.month = 'short'
-                    base.year = 'numeric'
-                }
+        isMe(id: number) {
+            return runtimeData.loginInfo.uin === id
+        },
+        getName(id: number) {
+            const back = runtimeData.chatInfo.info.group_members.filter((item) => {
+                return item.user_id === id
+            })
+            if (back.length === 1) {
+                return back[0].card === '' || back[0].card == null ? back[0].nickname : back[0].card
+            }
+            return id
+        },
+        fTime(time: number) {
+            // 将秒数转换为可阅读的事件，最大单位天
+            const day = Math.floor(time / 86400)
+            const hour = Math.floor((time % 86400) / 3600)
+            const minute = Math.floor((time % 3600) / 60)
+            const second = time % 60
+
+            let back = ''
+            if (day > 0) {
+                back += `${day} ${this.$t('days')} `
+            }
+            if (hour > 0) {
+                back += `${hour} ${this.$t('hours')} `
+            }
+            if (minute > 0) {
+                back += `${minute} ${this.$t('minutes')} `
+            }
+            if (second > 0) {
+                back += `${second} ${this.$t('seconds')} `
             }
-            return base
+            return back
         }
     },
     mounted() {
diff --git a/src/function/connect.ts b/src/function/connect.ts
index 8495e718..476acaee 100644
--- a/src/function/connect.ts
+++ b/src/function/connect.ts
@@ -192,6 +192,9 @@ export class Connector {
     static send(name: string, value: {[key: string]: any}, echo: string = name) {
         // 构建 JSON
         const json = JSON.stringify({ action: name, params: value, echo: echo } as BotActionElem)
+        this.sendRaw(json)
+    }
+    static sendRaw(json: string) {
         // 发送
         if(runtimeData.tags.isElectron) {
             const reader = runtimeData.reader
diff --git a/src/function/electron/connector.ts b/src/function/electron/connector.ts
index b3ded329..83f4bb6e 100644
--- a/src/function/electron/connector.ts
+++ b/src/function/electron/connector.ts
@@ -87,13 +87,13 @@ export class Connector {
             }
             if(this.reconnectTimes < 5) {
                 setTimeout(() => {
-                    if(e.code == 1015) {
-                        // TSL 连接失败，尝试使用非加密连接
-                        this.websocket = undefined
-                        this.logger.warn('连接失败，尝试使用非加密连接...')
-                        this.connect(url.replace('wss://', 'ws://'), token)
-                    } else if(e.code == 1006) {
-                        // 连接失败，尝试重连
+                    if(e.code == 1006) {
+                        // 连接失败，尝试轮替协议重连
+                        if(url.indexOf('wss://') >= 0) {
+                            url = url.replace('wss://', 'ws://')
+                        } else {
+                            url = url.replace('ws://', 'wss://')
+                        }
                         this.logger.warn('连接失败，尝试重连...')
                         this.connect(url, token)
                     }
@@ -102,6 +102,7 @@ export class Connector {
             }
         }
         this.websocket.onerror = (e) => {
+            this.websocket = undefined
             this.logger.error('连接错误：', e)
         }
     }
diff --git a/src/function/elements/information.ts b/src/function/elements/information.ts
index aa73bc8f..1a7552c2 100644
--- a/src/function/elements/information.ts
+++ b/src/function/elements/information.ts
@@ -86,13 +86,7 @@ export interface BaseChatInfoElem {
     jump?: string
 }
 
-export interface UserFriendElem {
-    group_id: number,
-    group_name: string,
-    py_name?: string,
-    member_count?: number,
-    admin_flag?: boolean,
-    
+export interface UserElem {
     new_msg?: boolean,
     raw_msg?: string,
     time?: number,
@@ -100,19 +94,21 @@ export interface UserFriendElem {
     message_id?: string
 }
 
-export interface UserGroupElem {
+export interface UserFriendElem extends UserElem {
+    group_id: number,
+    group_name: string,
+    py_name?: string,
+    member_count?: number,
+    admin_flag?: boolean
+}
+
+export interface UserGroupElem extends UserElem {
     user_id: number,
     nickname: string,
     remark: string,
     py_name?: string,
     class_id?: number,
-    class_name?: string,
-
-    new_msg?: boolean,
-    raw_msg?: string,
-    time?: number,
-    always_top?: boolean
-    message_id?: string
+    class_name?: string
 }
 
 export interface GroupMemberInfoElem {
diff --git a/src/function/msg.ts b/src/function/msg.ts
index ab35134a..0deb5c4b 100644
--- a/src/function/msg.ts
+++ b/src/function/msg.ts
@@ -52,7 +52,7 @@ export function parse(str: string) {
                 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 'getUserInfoInGroup'       : saveUserInfoInGroup(msg); break
                 case 'getGroupMemberList'       : saveGroupMember(msg.data); break
                 case 'getChatHistoryFist'       : saveMsg(msg, 'top'); break
                 case 'getChatHistoryOnMsg'      : updateTopMsg(msg, echoList); break
@@ -75,9 +75,9 @@ export function parse(str: string) {
                 case 'getGroupDirFiles'         : saveDirFile(msg); break
                 case 'readMemberMessage'        : readMemberMessage(msg.data[0]); break
                 case 'setFriendAdd':
-                case 'setGroupAdd'              : updateSysInfo(head); break
+                case 'setGroupAdd'              : updateSysInfo(msg, echoList); break
                 case 'loadFileBase'             : loadFileBase(echoList, msg); break
-                case 'GetRecentContact'         : createRecentContact(msg); break
+                case 'GetRecentContact'         : createRecentContact(msg); break 
 
                 case 'getCookies'               : saveCookie(msg, echoList); break
             }
@@ -99,6 +99,7 @@ export function parse(str: string) {
                     case 'friend_recall':
                     case 'recall'                   : revokeMsg(msg); break
                     case 'group_msg_emoji_like'     : showEmojiLike(msg); break
+                    case 'group_ban'                : groupBanNotice(msg); break
                 }
                 break
             }
@@ -367,6 +368,18 @@ function updateTopMsg(msg: any, echoList: string[]) {
     }
 }
 
+function saveUserInfoInGroup(msg: any) {
+    const data = getMsgData('group_member_info', msg, msgPath.group_member_info)
+    if(data && data[0]) {
+        const info = data[0]
+        // 单独判断下 shut_up_timestamp
+        if(info.shut_up_timestamp * 1000 < Date.now()) {
+            info.shut_up_timestamp = 0
+        }
+        runtimeData.chatInfo.info.me_info = info
+    }
+}
+
 function saveClassInfoAlone(msg: any) {
     const list = getMsgData('friend_category', msg, msgPath.friend_category) as {
         class_id: number,
@@ -445,6 +458,10 @@ function saveMsg(msg: any, append = undefined as undefined | string) {
         let list = getMsgData('message_list', msg, msgPath.message_list)
         list = getMessageList(list)
         if (list != undefined) {
+            // 在加载历史消息的时候判断是否支持分页追加
+            if(append == 'top' && runtimeData.jsonMap.message_list?.pageed == false) {
+                append = undefined
+            }
             // 追加处理
             if (append != undefined) {
                 // 没有更旧的消息能加载了，禁用允许加载标志
@@ -1138,11 +1155,16 @@ function readMemberMessage(data: any) {
 /**
  * 刷新系统通知和其他内容，给系统通知响应用的
  */
-function updateSysInfo(type: string) {
-    Connector.send('get_system_msg', {}, 'getSystemMsg')
-    switch (type) {
-        case 'setFriendAdd':
-            reloadUsers(); break
+function updateSysInfo(type: any, echoList: string[]) {
+    const flag = echoList[1]
+    // 从系统通知列表里删除这条消息
+    if (flag !== undefined) {
+        const index = runtimeData.systemNoticesList?.findIndex((item: any) => {
+            return item.flag == flag
+        })
+        if (index !== -1) {
+            runtimeData.systemNoticesList?.splice(index, 1)
+        }
     }
 }
 
@@ -1214,6 +1236,22 @@ function saveSticker(data: any) {
     }
 }
 
+function groupBanNotice(data: any) {
+    const groupId = data.group_id
+    const userId = data.user_id
+    const status = data.sub_type === 'ban' ? true : false
+    const duration = data.duration ?? 0     // 秒
+
+    if(userId == runtimeData.loginInfo.uin && groupId == runtimeData.chatInfo.show.id) {
+        if(status)
+            runtimeData.chatInfo.info.me_info.shut_up_timestamp = (new Date().getTime() + duration * 1000) / 1000
+        else 
+            runtimeData.chatInfo.info.me_info.shut_up_timestamp = 0
+    }
+
+    runtimeData.messageList.push(data)
+}
+
 // ==============================================================
 
 const baseRuntime = {
diff --git a/src/function/utils/appUtil.ts b/src/function/utils/appUtil.ts
index 5fb8bf7e..8bfe5925 100644
--- a/src/function/utils/appUtil.ts
+++ b/src/function/utils/appUtil.ts
@@ -113,6 +113,7 @@ export function loadHistory(info: BaseChatInfoElem) {
 }
 export function loadHistoryMessage(id: number, type: string, count = 20, echo = 'getChatHistoryFist') {
     let name
+    const pageed = !(runtimeData.jsonMap.message_list?.pageed == false)
     if(runtimeData.jsonMap.message_list && type != 'group') {
         name = runtimeData.jsonMap.message_list.private_name
     } else {
@@ -122,12 +123,10 @@ export function loadHistoryMessage(id: number, type: string, count = 20, echo =
     Connector.send(
         name ?? 'get_chat_history',
         {
-            message_type: runtimeData.jsonMap.message_list.message_type[type],
             group_id: type == 'group' ? id : undefined,
             user_id: type != 'group' ? id : undefined,
-            message_seq: 0,
             message_id: 0,
-            count: count
+            count: !pageed ? runtimeData.messageList.length + count : count
         },
         echo
     )
diff --git a/src/function/utils/systemUtil.ts b/src/function/utils/systemUtil.ts
index 0de0b100..3cedb346 100644
--- a/src/function/utils/systemUtil.ts
+++ b/src/function/utils/systemUtil.ts
@@ -231,4 +231,29 @@ export function getViewTime(time: number) {
     } else {
         return time
     }
+}
+
+/**
+ * 获取时间的配置
+ * @param date 
+ * @returns 
+ */
+export function getTimeConfig(date: Date) {
+    const base = { hour: 'numeric', minute: 'numeric', second: 'numeric' } as Intl.DateTimeFormatOptions
+    const nowDate = new Date()
+    const todayDate = new Date().setHours(0, 0, 0, 0)
+    const paramsDate = date.setHours(0, 0, 0, 0)
+    if(todayDate != paramsDate) {
+        if (nowDate.getFullYear() == date.getFullYear() && nowDate.getMonth() == date.getMonth()) {
+            base.weekday = 'short'
+        } else if(nowDate.getFullYear() == date.getFullYear()) {
+            base.day = 'numeric'
+            base.month = 'short'
+        } else {
+            base.day = 'numeric'
+            base.month = 'short'
+            base.year = 'numeric'
+        }
+    }
+    return base
 }
\ No newline at end of file
diff --git a/src/pages/Chat.vue b/src/pages/Chat.vue
index 6f5d3a07..5e48b88b 100644
--- a/src/pages/Chat.vue
+++ b/src/pages/Chat.vue
@@ -179,7 +179,9 @@
                             type="text"
                             v-model="msg"
                             autocomplete="off"
-                            :disabled="runtimeData.tags.openSideBar"
+                            :disabled="runtimeData.tags.openSideBar || chat.info.me_info.shut_up_timestamp > 0"
+                            :placeholder="chat.info.me_info.shut_up_timestamp > 0 ? $t('chat_send_msg_watermark_ban', {
+                            time: Intl.DateTimeFormat(trueLang, getTimeConfig(new Date(chat.info.me_info.shut_up_timestamp * 1000))).format(new Date(chat.info.me_info.shut_up_timestamp * 1000)) }) : ''"
                             @paste="addImg"
                             @keyup="mainKeyUp"
                             @click="selectSQIn()">
@@ -383,7 +385,7 @@ import imageCompression from 'browser-image-compression'
 
 import { defineComponent, markRaw } from 'vue'
 import { downloadFile, loadHistory as loadHistoryFirst } from '@/function/utils/appUtil'
-import { getTrueLang } from '@/function/utils/systemUtil'
+import { getTimeConfig, getTrueLang } from '@/function/utils/systemUtil'
 import { getMsgRawTxt, sendMsgRaw, getFace } from '@/function/utils/msgUtil'
 import { scrollToMsg } from '@/function/utils/appUtil'
 import { Logger, LogType, PopInfo, PopType } from '@/function/base'
@@ -405,6 +407,7 @@ export default defineComponent({
             getFace: getFace,
             Connector: Connector,
             runtimeData: runtimeData,
+            getTimeConfig: getTimeConfig,
             forwardList: runtimeData.userList,
             trueLang: getTrueLang(),
             tags: {
@@ -519,6 +522,7 @@ export default defineComponent({
                 // 锁定加载防止反复触发
                 this.tags.nowGetHistroy = true
                 // 发起获取历史消息请求
+                const pageed = !(runtimeData.jsonMap.message_list.pageed == false)
                 const type = runtimeData.chatInfo.show.type
                 const id = runtimeData.chatInfo.show.id
                 let name
@@ -530,12 +534,10 @@ export default defineComponent({
                 Connector.send(
                     name ?? 'get_chat_history',
                     {
-                        message_type: runtimeData.jsonMap.message_list.message_type[type],
                         group_id: type == 'group' ? id : undefined,
                         user_id: type != 'group' ? id : undefined,
-                        message_seq: firstMsgId,
                         message_id: firstMsgId,
-                        count: 20
+                        count: !pageed ? runtimeData.messageList.length + 20 : 20
                     },
                     'getChatHistory'
                 )
diff --git "a/src/pages/chat-view/Chat\345\274\271\345\271\225.vue" "b/src/pages/chat-view/Chat\345\274\271\345\271\225.vue"
index f6f237e6..2af067ad 100644
--- "a/src/pages/chat-view/Chat\345\274\271\345\271\225.vue"
+++ "b/src/pages/chat-view/Chat\345\274\271\345\271\225.vue"
@@ -311,6 +311,7 @@ export default defineComponent({
                     const id = runtimeData.chatInfo.show.id
                     const firstMsgId = this.list[0].message_id ?? 0
                     let name
+                    const pageed = !(runtimeData.jsonMap.message_list?.pageed == false)
                     if(runtimeData.jsonMap.message_list && type != 'group') {
                         name = runtimeData.jsonMap.message_list.private_name
                     } else {
@@ -319,12 +320,10 @@ export default defineComponent({
                     Connector.send(
                         name ?? 'get_chat_history',
                         {
-                            message_type: runtimeData.jsonMap.message_list.message_type[type],
                             group_id: type == 'group' ? id : undefined,
                             user_id: type != 'group' ? id : undefined,
-                            message_seq: firstMsgId,
                             message_id: firstMsgId,
-                            count: 10
+                            count: !pageed ? runtimeData.messageList.length + 10 : 10
                         },
                         'getChatHistory'
                     )
diff --git "a/src/pages/chat-view/Chat\347\273\210\347\253\257.vue" "b/src/pages/chat-view/Chat\347\273\210\347\253\257.vue"
index 0928ea90..4ec285b9 100644
--- "a/src/pages/chat-view/Chat\347\273\210\347\253\257.vue"
+++ "b/src/pages/chat-view/Chat\347\273\210\347\253\257.vue"
@@ -489,6 +489,7 @@ export default defineComponent({
                             const type = runtimeData.chatInfo.show.type
                             const id = runtimeData.chatInfo.show.id
                             let name
+                            const pageed = !(runtimeData.jsonMap.message_list?.pageed == false)
                             if(runtimeData.jsonMap.message_list && type != 'group') {
                                 name = runtimeData.jsonMap.message_list.private_name
                             } else {
@@ -497,12 +498,10 @@ export default defineComponent({
                             Connector.send(
                                 name ?? 'get_chat_history',
                                 {
-                                    message_type: runtimeData.jsonMap.message_list.message_type[type],
                                     group_id: type == 'group' ? id : undefined,
                                     user_id: type != 'group' ? id : undefined,
-                                    message_seq: firstMsgId,
                                     message_id: firstMsgId,
-                                    count: 20
+                                    count: !pageed ? runtimeData.messageList.length + 20 : 20
                                 },
                                 'getChatHistory'
                             )
diff --git a/src/pages/chat-view/SystemNotice.vue b/src/pages/chat-view/SystemNotice.vue
index 97342923..8b83598e 100644
--- a/src/pages/chat-view/SystemNotice.vue
+++ b/src/pages/chat-view/SystemNotice.vue
@@ -8,60 +8,52 @@
 
 <template>
     <div id="chat-pan"
-    :class="'chat-pan sys-not-pan' + (runtimeData.tags.openSideBar ? ' open': '') + (runtimeData.sysConfig.opt_no_window ? ' withBar': '')">
+        :class="'chat-pan sys-not-pan' + (runtimeData.tags.openSideBar ? ' open': '') + (runtimeData.sysConfig.opt_no_window ? ' withBar': '')">
         <div>
             <font-awesome-icon @click="exit" :icon="['fas', 'angle-left']" />
             <span>{{ $t('sys_notice') }}</span>
         </div>
         <div class="sys-not-list">
             <template v-for="(notice, index) in runtimeData.systemNoticesList" :key="'sysNot-' + index">
-                <div v-if="notice.request_type == 'friend'"
-                    class="sys_not_new_friend">
-                    <span>{{ $t('sys_notice_new_friend') }}</span>
+                <div v-if="notice.request_type == 'friend'">
                     <div>
+                        <img :src="'https://q1.qlogo.cn/g?b=qq&s=0&nk=' + notice.user_id">
                         <div>
-                            <img :src="'https://q1.qlogo.cn/g?b=qq&s=0&nk=' + notice.user_id">
-                            <div>
-                                <span>{{ notice.nickname }}</span>
-                                <div>
-                                    <span>{{ (notice.sex == 'female' ? '♀ ' : '♂ ') + notice.age }}</span>
-                                    <br>
-                                    <span>{{ notice.comment }}</span>
-                                </div>
-                                <span>{{ $t('sys_notice_new_friend_from') + notice.source }}</span>
-                            </div>
-                        </div>
-                        <div>
-                            <button @click="dealFriend(notice, false)" class="ss-button">{{ $t('btn_reject') }}</button>
-                            <button @click="dealFriend(notice, true)" class="ss-button">{{ $t('btn_accept') }}</button>
+                            <span>{{ notice.user_id }} {{ $t('sys_notice_new_friend') }}</span>
+                            <a>{{ Intl.DateTimeFormat(trueLang, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' })
+                                .format(new Date(notice.time * 1000)) }}</a>
+                            <a>{{ $t('sys_notice_message') + notice.comment }}</a>
                         </div>
                     </div>
+                    <div>
+                        <button @click="dealFriend(notice, false)" class="ss-button">{{ $t('btn_reject') }}</button>
+                        <button @click="dealFriend(notice, true)" class="ss-button">{{ $t('btn_accept') }}</button>
+                    </div>
                 </div>
-                <div v-else-if="notice.request_type == 'group'"
-                    class="sys_not_new_friend">
-                    <span>{{ $t('sys_notice_new_group_nmember') }}</span>
+                <div v-else-if="notice.request_type == 'group'">
                     <div>
+                        <img :src="'https://p.qlogo.cn/gh/' + notice.group_id + '/' + notice.group_id + '/0'">
                         <div>
-                            <img :src="'https://q1.qlogo.cn/g?b=qq&s=0&nk=' + notice.user_id">
-                            <div>
-                                <span>{{ notice.nickname }}</span>
-                                <div>
-                                    <span style="display: none;"></span>
-                                    <span :style="notice.comment == '' ? 'font-style: italic;' : ''">{{ notice.comment == '' ? $t('sys_notice_new_group_nmember_no_comment') : notice.comment }}</span>
-                                </div>
-                                <span>{{ $t('sys_notice_new_group_nmember_add') + notice.group_name }}</span>
-                            </div>
+                            <span>{{ getName(notice.user_id) }} {{ $t('sys_notice_invite_group') }} {{ notice.group_id }}</span>
+                            <a>{{ Intl.DateTimeFormat(trueLang, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' })
+                                .format(new Date(notice.time * 1000)) }}</a>
+                            <a>{{ $t('sys_notice_message') + notice.comment }}</a>
                         </div>
+                    </div>
+                    <div>
+                        <button @click="dealGroupAdd(notice, false)" class="ss-button">{{ $t('btn_reject') }}</button>
+                        <button @click="dealGroupAdd(notice, true)" class="ss-button">{{ $t('btn_accept') }}</button>
+                    </div>
+                </div>
+                <div v-else v-show="NODE_ENV == 'development'">
+                    <div>
+                        <img>
                         <div>
-                            <button @click="dealGroupAdd(notice, false)" class="ss-button">{{ $t('btn_reject') }}</button>
-                            <button @click="dealGroupAdd(notice, true)" class="ss-button">{{ $t('btn_accept') }}</button>
+                            <span>{{ $t('sys_notice_unknow') }}</span>
+                            <a style="color: var(--color-font-2);word-wrap: anywhere;">request: {{ notice.request_type }}; sub: {{ notice.sub_type }}</a>
                         </div>
                     </div>
                 </div>
-                <div v-else v-show="NODE_ENV == 'development'" class="sys_not_new_friend">
-                    <span>不支持的消息类型</span>
-                    <a style="color: var(--color-font-2);word-wrap: anywhere;">{{ JSON.stringify(notice) }}</a>
-                </div>
             </template>
         </div>
     </div>
@@ -72,12 +64,14 @@ import { defineComponent } from 'vue'
 
 import { runtimeData } from '@/function/msg'
 import { Connector } from '@/function/connect'
+import { getTrueLang } from '@/function/utils/systemUtil'
 
 export default defineComponent({
     name: 'ChatSystemNotice',
     components: {},
     data() {
         return {
+            trueLang: getTrueLang(),
             runtimeData: runtimeData,
             NODE_ENV: process.env.NODE_ENV
         }
@@ -102,7 +96,7 @@ export default defineComponent({
                     flag: notice.flag,
                     approve: deal
                 },
-                'setFriendAdd'
+                'setFriendAdd_' + notice.flag
             )
         },
 
@@ -119,16 +113,13 @@ export default defineComponent({
                     approve: deal,
                     sub_type: notice.sub_type
                 },
-                'setGroupAdd'
+                'setGroupAdd_' + notice.flag
             )
+        },
+
+        getName(id: number) {
+            return runtimeData.userList.filter((user) => user.user_id == id)[0].nickname
         }
-    },
-    mounted()  {
-        this.$watch(() => runtimeData.systemNoticesList, () => {
-            if(runtimeData.systemNoticesList && runtimeData.systemNoticesList.length <= 0) {
-                this.exit()
-            }
-        })
     }
 })
 </script>
diff --git a/src/pages/options/OptDev.vue b/src/pages/options/OptDev.vue
index 399425d7..30046031 100644
--- a/src/pages/options/OptDev.vue
+++ b/src/pages/options/OptDev.vue
@@ -198,7 +198,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import { runASWEvent as save, saveAll } from '@/function/option'
-import { websocket as ws } from '@/function/connect'
+import { Connector, websocket as ws } from '@/function/connect'
 import { PopInfo, PopType } from '@/function/base'
 import { runtimeData } from '@/function/msg'
 import app from '@/main'
@@ -229,7 +229,7 @@ export default defineComponent({
                 this.ws_text = ''
                 // 修改 echo 防止被消息处理机处理
                 info.echo = 'websocketTest'
-                if(ws) ws.send(JSON.stringify(info))
+                Connector.sendRaw(JSON.stringify(info))
             }
         },
         sendTestAppmsg (event: KeyboardEvent) {
diff --git a/src/pages/options/OptInfo.vue b/src/pages/options/OptInfo.vue
index d2d826d4..8a0b81f2 100644
--- a/src/pages/options/OptInfo.vue
+++ b/src/pages/options/OptInfo.vue
@@ -28,6 +28,11 @@
                 </div>
                 <input class="ss-input" style="width:150px" type="text" @keyup="setGroupCard" v-model="runtimeData.chatInfo.info.me_info.card">
             </div>
+
+            <button class="ss-button" style="width: calc(100% - 60px); margin: 30px 30px 0 30px;"
+                @click="leaveGroup()">
+                {{ $t('exit_group') }}
+            </button>
         </template>
     </div>
 </template>
@@ -36,6 +41,7 @@
 import { defineComponent } from 'vue'
 import { runtimeData } from '@/function/msg'
 import { Connector } from '@/function/connect'
+import { reloadUsers } from '@/function/utils/appUtil'
 
 export default defineComponent({
     name: 'ViewOptInfo',
@@ -79,6 +85,41 @@ export default defineComponent({
                     'setGroupName'
                 )
             }
+        },
+
+        /**
+         * 退出群聊
+        */
+        leaveGroup() {
+            const popInfo = {
+                html: '<span>' + this.$t('trust_leave_group') + '</span>',
+                button: [
+                    {
+                        text: this.$t('btn_yes'),
+                        fun: () => {
+                            if(runtimeData.jsonMap.leave_group?.name) {
+                                Connector.send(runtimeData.jsonMap.leave_group?.name, {
+                                    group_id: this.chat.show.id
+                                }, 'leaveGroup')
+                            }
+                            // 从消息列表中删除该群聊
+                            runtimeData.onMsgList = runtimeData.onMsgList.filter((item: any) => item.group_id !== this.chat.show.id)
+                            // 关闭群聊窗口
+                            runtimeData.chatInfo.show.id = 0
+                            // 刷新好友/群列表
+                            reloadUsers()
+
+                            runtimeData.popBoxList.shift()
+                        }
+                    },
+                    {
+                        text: this.$t('btn_no'),
+                        master: true,
+                        fun: () => { runtimeData.popBoxList.shift() }
+                    }
+                ]
+            }
+            runtimeData.popBoxList.push(popInfo)
         }
     }
 })

From e10b46ffe7c65692876816d26c83b9997dae688b Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Tue, 27 Aug 2024 18:53:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E5=89=8D=E6=A3=80=E6=9F=A5=20?=
 =?UTF-8?q?=E2=9C=A8=20=E8=8E=B7=E5=8F=96=E6=89=B9=E9=87=8F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E5=88=A4=E6=96=AD=E6=B6=88=E6=81=AF=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=B8=BA=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=20:poop:=20=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeBody.vue |  2 +-
 src/function/msg.ts           | 10 ++++++++++
 src/pages/options/OptDev.vue  |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/NoticeBody.vue b/src/components/NoticeBody.vue
index 89e6716d..3e6ccdd3 100644
--- a/src/components/NoticeBody.vue
+++ b/src/components/NoticeBody.vue
@@ -68,7 +68,7 @@ export default defineComponent({
             return id
         },
         fTime(time: number) {
-            // 将秒数转换为可阅读的事件，最大单位天
+            // 将秒数转换为可阅读的时间，最大单位天
             const day = Math.floor(time / 86400)
             const hour = Math.floor((time % 86400) / 3600)
             const minute = Math.floor((time % 3600) / 60)
diff --git a/src/function/msg.ts b/src/function/msg.ts
index 0deb5c4b..b64e810d 100644
--- a/src/function/msg.ts
+++ b/src/function/msg.ts
@@ -458,6 +458,16 @@ function saveMsg(msg: any, append = undefined as undefined | string) {
         let list = getMsgData('message_list', msg, msgPath.message_list)
         list = getMessageList(list)
         if (list != undefined) {
+            // 检查消息是否是当前聊天的消息
+            const firstMsg = list[0]
+            const infoList = getMsgData('message_info', firstMsg, msgPath.message_info)
+            if (infoList != undefined) {
+                const info = infoList[0]
+                const id = info.group_id ?? info.private_id
+                if (id != undefined && id != runtimeData.chatInfo.show.id) {
+                    return
+                }
+            }
             // 在加载历史消息的时候判断是否支持分页追加
             if(append == 'top' && runtimeData.jsonMap.message_list?.pageed == false) {
                 append = undefined
diff --git a/src/pages/options/OptDev.vue b/src/pages/options/OptDev.vue
index 30046031..a5cd74f7 100644
--- a/src/pages/options/OptDev.vue
+++ b/src/pages/options/OptDev.vue
@@ -198,7 +198,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import { runASWEvent as save, saveAll } from '@/function/option'
-import { Connector, websocket as ws } from '@/function/connect'
+import { Connector } from '@/function/connect'
 import { PopInfo, PopType } from '@/function/base'
 import { runtimeData } from '@/function/msg'
 import app from '@/main'