koishi-plugin-chat-patch 5.6.1 → 6.1.0

package/client/web/src/pages/Chat.vue

@@ -502,13 +502,6 @@
                         <div><font-awesome-icon :icon="['fas', 'trash-can']" /></div>
                         <a>{{ $t('移出群聊') }}</a>
                     </div>
-                    <div v-show="tags.menuDisplay.config"
-                        @click="openChatInfoPan();
-                                ($refs.infoRef as any).openMoreConfig(selectedMsg?.sender.user_id);
-                                closeMsgMenu();">
-                        <div><font-awesome-icon :icon="['fas', 'cog']" /></div>
-                        <a>{{ $t('成员设置') }}</a>
-                    </div>
                     <div v-show="tags.menuDisplay.jumpToMsg" @click="jumpSearchMsg">
                         <div><font-awesome-icon :icon="['fas', 'arrow-up-right-from-square']" /></div>
                         <a>{{ $t('跳转到消息') }}</a>
@@ -588,7 +581,6 @@ import { v4 as uuid } from 'uuid'
 import {
 	scrollToMsg,
     downloadFile,
-    loadHistory as loadHistoryFirst,
     shouldAutoFocus,
 	vMenu,
 	vMove,
@@ -612,7 +604,6 @@ import {
 import { Logger, LogType, PopInfo, PopType } from '../function/base'
 import { Connector, loadChatHistoryFromCache, saveSentSelfMessage, sendForwardMessage } from '../function/connect'
 import {
-    BaseChatInfoElem,
     MsgItemElem,
     SQCodeElem,
     GroupMemberInfoElem,
@@ -735,6 +726,14 @@ const forwardList = ref(contactStore.userList)
 const chatImg = ref<any>(undefined)
 const trueLang = getTrueLang()
 
+const HISTORY_PAGE_SIZE = 50
+const HISTORY_INITIAL_LIMIT = 100
+
+function currentChatTargetKey(): string {
+    const show = chatStore.chatInfo.show
+    return `${String(show.type ?? '')}:${String(show.id ?? '')}:${String(show.channel_id ?? '')}`
+}
+
 function messageLocalTimeMs(item: any): number {
     const local = Number(item?.local_time ?? item?.timestamp_ms ?? item?.time_ms ?? 0)
     if (local) return local
@@ -745,6 +744,7 @@ function messageLocalTimeMs(item: any): number {
 async function refreshSelfHistory() {
     const id = chat.show.id
     if (!id || id === 0 || details.value[3].open || tags.value.showForwardPan) return
+    const targetKey = currentChatTargetKey()
     const channelId = chat.show.type === 'group'
         ? String(chat.show.channel_id ?? id)
         : String(chat.show.channel_id ?? id)
@@ -754,12 +754,12 @@ async function refreshSelfHistory() {
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 30,
+            limit: HISTORY_INITIAL_LIMIT,
         })
     } catch {
         return
     }
-    if (!cached.length || String(chat.show.id) !== String(id)) return
+    if (!cached.length || String(chat.show.id) !== String(id) || targetKey !== currentChatTargetKey()) return
 
     const seen = new Set<string>()
     const addSeen = (item: any) => {
@@ -1178,6 +1178,8 @@ async function loadMoreHistory() {
         const firstMsg = list[0]
         const firstMsgId = firstMsg.message_id
         const firstMsgTime = Number(firstMsg?.time)
+        const targetKey = currentChatTargetKey()
+        const isStale = () => targetKey !== currentChatTargetKey()
         const cacheBeforeTime = Number(
             firstMsg?.local_time ?? firstMsg?.timestamp_ms ?? firstMsg?.time_ms ?? 0
         ) || (Number.isFinite(firstMsgTime) ? firstMsgTime * 1000 : 0)
@@ -1191,6 +1193,10 @@ async function loadMoreHistory() {
             uiStore.historyBeforeTime = undefined
         }
         uiStore.loadHistoryFail = false
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
 
         const channelId = String(
             chatStore.chatInfo.show.channel_id
@@ -1214,6 +1220,10 @@ async function loadMoreHistory() {
                     20,
                 )
             }
+            if (isStale()) {
+                uiStore.nowGetHistory = false
+                return
+            }
             if (localMsgs.length > 0) {
                 const existingIds = new Set(chatStore.messageList.map((m) => String(m.message_id ?? '')))
                 const addList = localMsgs.filter((m) => {
@@ -1230,14 +1240,22 @@ async function loadMoreHistory() {
                 }
             }
         }
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
 
         const cached = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
             channelId,
-            limit: 20,
+            limit: HISTORY_PAGE_SIZE,
             beforeTimeMs: cacheBeforeTime > 0 ? cacheBeforeTime : undefined,
         })
+        if (isStale()) {
+            uiStore.nowGetHistory = false
+            return
+        }
         const existingIds = new Set(chatStore.messageList.map((m) => String(m.message_id ?? '')))
         const addList = cached.filter((m) => {
             const msgId = String(m.message_id ?? '')
@@ -1246,7 +1264,7 @@ async function loadMoreHistory() {
         if (addList.length > 0) {
             chatStore.messageList.splice(0, 0, ...addList)
         }
-        if (cached.length < 20) {
+        if (cached.length < HISTORY_PAGE_SIZE) {
             uiStore.canLoadHistory = false
         }
         uiStore.nowGetHistory = false
@@ -2064,6 +2082,8 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     forwardContent: msgBody,
                                     source: 'webui',
                                     sentAt: sentTime,
+                                    timestamp: Math.floor(sentTime / 1000),
+                                    timestampMs: sentTime,
                                     kind: 'forward',
                                 })
                             }
@@ -2938,23 +2958,6 @@ function updateList(newLength: number, oldLength: number) {
             NewMsgNum.value = Math.abs(newLength - oldLength)
         }
     }
-    if (
-        list.length > 200 &&
-        !uiStore.nowGetHistory &&
-        !tags.value.showBottomButton
-    ) {
-        chatStore.messageList = []
-        const info = {
-            type: chat.show.type,
-            id: chat.show.id,
-            name: chat.show.name,
-            avatar: chat.show.avatar,
-            jump: chat.show.jump,
-        } as BaseChatInfoElem
-        loadHistoryFirst(info)
-        uiStore.nowGetHistory = true
-    }
-
     const pan = document.getElementById('msgPan')
     if (pan !== null) {
         const height = pan.scrollHeight
@@ -2968,7 +2971,7 @@ function updateList(newLength: number, oldLength: number) {
                     )
                 }
                 if (!uiStore.nowGetHistory) {
-                    if (!tags.value.showBottomButton) {
+                    if (shouldKeepChatAtBottom || oldLength <= 0) {
                         scrollTo(newPan.scrollHeight)
                     }
                     if (oldLength <= 0) {
@@ -2988,7 +2991,7 @@ function updateList(newLength: number, oldLength: number) {
                                 msgItem.type === 'image' &&
                                 msgItem.file != 'marketface'
                             ) {
-                                getImgList.push(msgItem.url)
+                                getImgList.push(msgItem.url || msgItem.file)
                             }
                         }
                     }

package/lib/database.d.ts

@@ -11,8 +11,8 @@ export declare class ChatDatabase {
     constructor(ctx: Context, config: Config, logger: PluginLogger);
     private get db();
     initialize(): Promise<void>;
+    private loadLevelModule;
     dispose(): Promise<void>;
-    private ensureOpen;
     private releaseShared;
     clearAll(): Promise<void>;
     appendMessage(record: MessageRecord): Promise<void>;
@@ -56,6 +56,8 @@ export declare class ChatDatabase {
         type: string;
         contacts: ContactCacheItem[];
     }>>;
-    private trimMessages;
-    private trimSelfMessages;
+    private trimChannel;
+    cleanupExcess(): Promise<void>;
+    private trimRows;
+    private extractRecordTime;
 }

package/lib/gateway.d.ts

@@ -1,5 +1,4 @@
 import { Context } from 'koishi';
-import { Config } from './config';
 import { ChatDatabase } from './database';
 import { PluginLogger } from './logger';
 import { Recorder } from './recorder';
@@ -17,7 +16,6 @@ export type SatoriGatewayPayload = {
 type SatoriGatewayHandler = (payload: SatoriGatewayPayload) => void;
 export declare class SatoriGateway {
     private ctx;
-    private config;
     private database;
     private recorder;
     private logger;
@@ -30,7 +28,8 @@ export declare class SatoriGateway {
     private sequence;
     private logins;
     private online;
-    constructor(ctx: Context, config: Config, database: ChatDatabase, recorder: Recorder, logger: PluginLogger, onPayload: SatoriGatewayHandler);
+    private lastPongAt;
+    constructor(ctx: Context, database: ChatDatabase, recorder: Recorder, logger: PluginLogger, onPayload: SatoriGatewayHandler);
     start(): Promise<void>;
     dispose(): void;
     getLogins(): SatoriLoginInfo[];
@@ -40,7 +39,6 @@ export declare class SatoriGateway {
     private scheduleReconnect;
     private handleMessage;
     private normalizeLogins;
-    private isBlocked;
     private setOnline;
 }
 export {};

package/lib/index.d.ts

@@ -0,0 +1,17 @@
+import { Context } from 'koishi';
+import { Console } from '@koishijs/console';
+import { Config } from './config';
+export declare const name = "chat-patch";
+export declare const reusable = false;
+export declare const filter = false;
+export declare const inject: {
+    required: string[];
+};
+declare module 'koishi' {
+    interface Context {
+        console: Console;
+    }
+}
+export declare const usage = "\n---\n\n\u57FA\u4E8E Satori \u534F\u8BAE\u7684 Koishi \u540E\u53F0\u804A\u5929\u5BA4\u3002\n\u9700\u8981\u5728 Koishi \u4E2D\u542F\u7528 server-satori\uFF0C\u5E76\u5728\u63D2\u4EF6\u5185\u6784\u5EFA web \u5E94\u7528\u3002\n\n---\n\n\u9700\u8981\u5B89\u88C5 w-node \u63D2\u4EF6\uFF0C\u5E76\u5F00\u542F w-node\u3001market\u3001server-satori \u63D2\u4EF6\u3002\n\n---\n";
+export { Config } from './config';
+export declare function apply(ctx: Context, config: Config): Promise<void>;