永远的分页

✨ 支持非分页模式加载消息 <- #120 🐛 修正后端连接模式 SSL 协议错误的问题
Stapxs · Aug 27, 2024 · b949123 · b949123
1 parent 84a0bb3
commit b949123
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git 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

diff --git 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/msg.ts b/src/function/msg.ts
@@ -458,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) {
                 // 没有更旧的消息能加载了，禁用允许加载标志

diff --git 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/pages/Chat.vue b/src/pages/Chat.vue
@@ -522,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
@@ -533,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弹幕.vue b/src/pages/chat-view/Chat弹幕.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终端.vue b/src/pages/chat-view/Chat终端.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/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) {