koishi-plugin-chat-patch 5.3.1 → 5.5.1

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

@@ -738,12 +738,6 @@ const searchRequestId = ref(0)
 const forwardList = ref(contactStore.userList)
 const chatImg = ref<any>(undefined)
 const trueLang = getTrueLang()
-let selfRefreshTimer: number | null = null
-
-function ensureChannelPrefix(channelId: string, prefix: string): string {
-    if (/^(?:group|room|chat|channel|guild|private):/i.test(channelId)) return channelId
-    return `${prefix}:${channelId}`
-}
 
 function messageLocalTimeMs(item: any): number {
     const local = Number(item?.local_time ?? item?.timestamp_ms ?? item?.time_ms ?? 0)
@@ -756,8 +750,8 @@ async function refreshSelfHistory() {
     const id = chat.show.id
     if (!id || id === 0 || details.value[3].open || tags.value.showForwardPan) return
     const channelId = chat.show.type === 'group'
-        ? ensureChannelPrefix(String(chat.show.channel_id ?? id), 'group')
-        : ensureChannelPrefix(String(chat.show.channel_id ?? id), 'private')
+        ? String(chat.show.channel_id ?? id)
+        : String(chat.show.channel_id ?? id)
     let cached: Record<string, unknown>[] = []
     try {
         cached = await loadChatHistoryFromCache({
@@ -798,22 +792,8 @@ async function refreshSelfHistory() {
 }
 
 function startSelfRefresh() {
-    if (selfRefreshTimer !== null) {
-        window.clearInterval(selfRefreshTimer)
-        selfRefreshTimer = null
-    }
     if (!chat.show.id) return
     void refreshSelfHistory()
-    selfRefreshTimer = window.setInterval(() => {
-        void refreshSelfHistory()
-    }, 2500)
-}
-
-function stopSelfRefresh() {
-    if (selfRefreshTimer !== null) {
-        window.clearInterval(selfRefreshTimer)
-        selfRefreshTimer = null
-    }
 }
 
 //#region == 窗口移动相关 ==================================================
@@ -973,7 +953,6 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-    stopSelfRefresh()
     if (resizeMainInputFrame !== null) {
         cancelAnimationFrame(resizeMainInputFrame)
         resizeMainInputFrame = null
@@ -1217,19 +1196,24 @@ async function loadMoreHistory() {
         }
         uiStore.loadHistoryFail = false
 
+        const channelId = String(
+            chatStore.chatInfo.show.channel_id
+            ?? chatStore.chatInfo.show.id
+            ?? '',
+        )
         if (useMixedHistory) {
             let localMsgs = [] as any[]
             if (Number.isFinite(firstMsgTime)) {
                 localMsgs = await dbGetBeforeByTime(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    channelId,
                     firstMsgTime,
                     20,
                 )
             } else {
                 localMsgs = await dbGetBefore(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    channelId,
                     firstMsgId,
                     20,
                 )
@@ -1251,12 +1235,6 @@ async function loadMoreHistory() {
             }
         }
 
-        const type = chatStore.chatInfo.show.type
-        const id = chatStore.chatInfo.show.id
-        const rawChannelId = String(chatStore.chatInfo.show.channel_id ?? '')
-        const channelId = type === 'group'
-            ? ensureChannelPrefix(rawChannelId || String(id), 'group')
-            : ensureChannelPrefix(rawChannelId || String(id), 'private')
         const cached = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
@@ -2030,6 +2008,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                             targetType as 'group' | 'user',
                             targetId,
                             msgBody,
+                            targetChannelId || undefined,
                         )
                         if (!result.ok) {
                             new PopInfo().add(PopType.ERR, $t('合并转发发送失败'))
@@ -2072,11 +2051,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     scrollToMsg('chat-' + sentMsg.message_id, true)
                                 })
                             }
-                            const sentChannelId = targetType === 'group'
-                                ? (targetChannelId || targetId)
-                                : /^(?:private|direct):/i.test(targetChannelId || '')
-                                  ? targetChannelId
-                                  : `private:${targetId}`
+                            const sentChannelId = result.channelId || targetChannelId || targetId
                             if (result.native && !result.messageId) {
                                 // 原生路径已经由后端 before-send/发送拦截写入，缺少消息 id 时不再重复写入
                             } else {
@@ -2096,7 +2071,8 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     kind: 'forward',
                                 })
                             }
-                            const targetSession = contactStore.baseOnMsgList.get(normalizeSessionId(targetId))
+                            const targetSessionKey = targetChannelId || targetId
+                            const targetSession = contactStore.baseOnMsgList.get(normalizeSessionId(targetSessionKey))
                             if (targetSession) {
                                 const preview = `[${$t('聊天记录')}]`
                                 targetSession.raw_msg_base = preview
@@ -2104,7 +2080,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     ? `${String(authStore.loginInfo.nickname ?? '')}: ${preview}`
                                     : preview
                                 targetSession.time = Math.floor(sentTime / 1000)
-                                contactStore.baseOnMsgList.set(normalizeSessionId(targetId), targetSession)
+                                contactStore.baseOnMsgList.set(normalizeSessionId(targetSessionKey), targetSession)
                                 updateBaseOnMsgList()
                             }
                         }
@@ -2153,8 +2129,9 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
 
 function finishForward(data: UserFriendElem & UserGroupElem, id: string | number) {
     cancelForward()
-    if(contactStore.baseOnMsgList.get(normalizeSessionId(id)) == undefined) {
-        contactStore.baseOnMsgList.set(normalizeSessionId(id), data)
+    const sessionKey = String(data.channel_id ?? data.channelId ?? id ?? '')
+    if(contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey)) == undefined) {
+        contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), data)
     }
     nextTick(() => {
         const user = document.getElementById('user-' + id)
@@ -2267,7 +2244,15 @@ async function revokeMsg() {
         ?? chatStore.chatInfo.show.channel_id
         ?? chat.show.id,
     )
-    await Connector.callApi('delete_msg', { channel_id: channelId, message_id: msgId })
+    try {
+        await Connector.callApi('delete_msg', { channel_id: channelId, message_id: msgId })
+    } catch {
+        new PopInfo().add(PopType.ERR, $t('撤回失败'))
+        return
+    }
+    msgData.revoke = true
+    msgData.revoked = true
+    msgData.revokeTime = Date.now() / 1000
 }
 
 async function reeditMsg() {
@@ -2629,13 +2614,31 @@ function sendVideo(file: File, fileName: string | null) {
     sendMedia(file, fileName, 'video')
 }
 
+async function isGifImage(file: File): Promise<boolean> {
+    if (file.type === 'image/gif' || /\.gif$/i.test(file.name || '')) return true
+    try {
+        const buffer = await file.slice(0, 6).arrayBuffer()
+        const bytes = new Uint8Array(buffer)
+        return bytes.length >= 6
+            && bytes[0] === 0x47
+            && bytes[1] === 0x49
+            && bytes[2] === 0x46
+            && bytes[3] === 0x38
+            && (bytes[4] === 0x37 || bytes[4] === 0x39)
+            && bytes[5] === 0x61
+    } catch {
+        return false
+    }
+}
+
 async function setImg(file: File | null) {
     const popInfo = new PopInfo()
     if (!file) return
     if (!file.type.includes('image/')) return
     if (file.size === 0) return
+    const isGif = await isGifImage(file)
 
-    if (file.size > 3145728) {
+    if (file.size > 3145728 && !isGif) {
         const options = { maxSizeMB: 3, useWebWorker: true }
         try {
             popInfo.add(PopType.INFO, $t('正在压缩图片 ……'))
@@ -3170,7 +3173,8 @@ async function handleInput(event: Event) {
             searchDebounceTimer.value = setTimeout(async () => {
                 const results = await dbSearchMessages(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    chatStore.chatInfo.show.channel_id
+                    ?? chatStore.chatInfo.show.id,
                     value,
                 )
                 if (requestId !== searchRequestId.value || !details.value[3].open) return

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

@@ -14,7 +14,7 @@
         <div id="friend-list" :class="'friend-list' + (uiStore.openSideBar ? ' open' : '')">
             <div>
                 <div class="base">
-                    <span>{{ $t('列表') }}</span>
+                    <span>{{ $t('联系人列表') }}</span>
                     <div style="flex: 1" />
                     <font-awesome-icon :icon="['fas', 'rotate-right']" @click="reloadUser" />
                 </div>
@@ -184,7 +184,7 @@
     import { reloadUsers } from '../function/utils/appUtil'
     import { Connector, flushPendingBotEvents, loadContactsFromCache, login as loginInfo } from '../function/connect'
     import { botKey, getActiveBot, getLogins, setActiveBot } from '../function/satori'
-    import { normalizeGroupId, normalizeSessionId } from '../function/utils/sessionUtil'
+    import { normalizeSessionId } from '../function/utils/sessionUtil'
     import { avatarError } from '../function/utils/avatarUtil'
     import { backend } from '../runtime/backend'
     import { matchPinyin } from '../function/utils/pinyin'
@@ -253,9 +253,7 @@
                     || '',
                 )
                 const groupId = String(item.group_id || '')
-                const id = groupId
-                    ? `group:${normalizeGroupId(rawId || groupId)}`
-                    : `user:${rawId.replace(/^(?:private|direct):/i, '')}`
+                const id = `${groupId ? 'group' : 'user'}|${String(rawId || groupId || item.user_id || '')}`
                 const key = [bot?.platform ?? '', bot?.selfId ?? '', id]
                     .map((value) => encodeURIComponent(String(value)))
                     .join(':')
@@ -665,12 +663,12 @@
         font-size: 0.9rem;
     }
 
-    @media (max-width: 700px) {
+    @media (max-width: 800px) {
         .exp-header:not(.open) {
             display: none;
         }
     }
-    @media (max-width: 500px) {
+    @media (max-width: 800px) {
         .exp-header > span {
             display: block !important;
         }

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

@@ -246,7 +246,7 @@ function userChannelId(): string {
         || props.chat.show.channelId
         || props.chat.info.user_info.channel_id
         || props.chat.info.user_info.channelId
-        || `private:${props.chat.show.id}`,
+        || String(props.chat.show.id),
     )
 }
 
@@ -256,7 +256,7 @@ function groupChannelId(): string {
         || props.chat.show.channelId
         || props.chat.info.group_info.channel_id
         || props.chat.info.group_info.channelId
-        || `group:${props.chat.show.id}`,
+        || String(props.chat.show.id),
     )
 }
 

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

@@ -10,7 +10,7 @@
 -->
 
 <template>
-    <div class="friend-view">
+    <div class="friend-view" :class="{ 'empty-list': messageListEmpty }">
         <div class="friend-list-container">
             <div id="message-list"
                 :class="'friend-list' +
@@ -18,24 +18,13 @@
                     (showGroupAssist ? ' show' : '')">
                 <div>
                     <div class="base only">
-                        <span>{{ $t('消息') }}</span>
+                        <span>{{ $t('消息列表') }}</span>
                         <div style="flex: 1" />
                         <font-awesome-icon
                             :icon="['fas', 'clock-rotate-left']"
                             @click="openHistory" />
                         <font-awesome-icon :icon="['fas', 'trash-can']" @click="cleanList" />
                     </div>
-                    <div class="small">
-                        <span>{{ $t('消息') }}</span>
-                        <div v-if="showGroupAssist"
-                            style="margin-right: -5px;margin-left: 5px;"
-                            @click="showGroupAssist = !showGroupAssist">
-                            <font-awesome-icon :icon="['fas', 'angle-left']" />
-                        </div>
-                        <div @click="openLeftBar">
-                            <font-awesome-icon :icon="['fas', 'bars-staggered']" />
-                        </div>
-                    </div>
                 </div>
                 <div id="message-list-body" class="robot-accordion-list">
                     <div v-for="bot in satoriLogins" :key="'bot-' + botKey(bot.platform, bot.selfId)"
@@ -50,7 +39,7 @@
                         </div>
                         <div v-if="botKey(bot.platform, bot.selfId) === activeBotId" class="robot-accordion-content">
                             <div v-if="!showGroupAssist &&
-                                !contactStore.systemNoticesList &&
+                                !hasSystemNotices &&
                                 (!contactStore.groupAssistList || contactStore.groupAssistList.length === 0) &&
                                 contactStore.onMsgList.length === 0"
                                 class="empty-state">
@@ -63,8 +52,7 @@
                                 style="overflow-x: hidden">
                                 <!-- 系统信息 -->
                                 <FriendBody v-if="!showGroupAssist &&
-                                                contactStore.systemNoticesList &&
-                                                Object.keys(contactStore.systemNoticesList).length > 0"
+                                                hasSystemNotices"
                                     key="inMessage--10000"
                                     :select="chat.show.id === -10000"
                                     :menu="menu.select && menu.select.user_id === -10000"
@@ -127,15 +115,15 @@
                         <a v-if="contactStore.newMsgCount > 0">{{ contactStore.newMsgCount }}</a>
                     </div>
                     <div class="small">
-                        <span style="cursor: pointer;">
-                            {{ $t('群收纳盒') }}
-                            <a v-if="contactStore.newMsgCount > 0">{{ contactStore.newMsgCount }}</a>
-                        </span>
                         <div v-if="showGroupAssist"
                             style="margin-right: -5px;margin-left: 5px;"
                             @click="showGroupAssist = !showGroupAssist">
                             <font-awesome-icon :icon="['fas', 'angle-left']" />
                         </div>
+                        <span style="cursor: pointer;">
+                            {{ $t('群收纳盒') }}
+                            <a v-if="contactStore.newMsgCount > 0">{{ contactStore.newMsgCount }}</a>
+                        </span>
                         <div @click="openLeftBar">
                             <font-awesome-icon :icon="['fas', 'bars-staggered']" />
                         </div>
@@ -380,6 +368,17 @@
     const menu = Menu.append
     const showMenu = ref(false)
     const showGroupAssist = ref(false)
+    const hasSystemNotices = computed(() => {
+        const value = contactStore.systemNoticesList
+        if (Array.isArray(value)) return value.length > 0
+        return Boolean(value && Object.keys(value).length > 0)
+    })
+    const messageListEmpty = computed(() => {
+        return !showGroupAssist.value &&
+            !hasSystemNotices.value &&
+            (!contactStore.groupAssistList || contactStore.groupAssistList.length === 0) &&
+            contactStore.onMsgList.length === 0
+    })
 
     onMounted(() => {
         library.add(faCheckToSlot, faThumbTack, faTrashCan, faGripLines, faBroom)
@@ -395,8 +394,11 @@
     function userClick(data: UserFriendElem & UserGroupElem) {
         const id = data.group_id || data.user_id
         if (id === undefined || id === null || String(id) === '' || String(id) === '0') return
+        const fromGroupAssist = showGroupAssist.value
         if (!trRead.value && id != props.chat.show.id) {
-            if (uiStore.openSideBar) {
+            if (fromGroupAssist) {
+                uiStore.openSideBar = false
+            } else if (uiStore.openSideBar) {
                 openLeftBar()
             }
             const back = {
@@ -895,16 +897,28 @@
         background: transparent !important;
     }
 
-    @media (max-width: 700px) {
+    @media (max-width: 800px) {
         .friend-list-container {
             overflow: unset;
         }
+        .friend-view.empty-list .friend-list-container {
+            flex: 1;
+            min-width: 100%;
+            width: 100%;
+        }
+        .friend-view.empty-list #message-list {
+            flex: 1;
+            width: 100% !important;
+        }
+        .friend-view.empty-list .friend-list-space {
+            display: none !important;
+        }
         .menu {
             width: 140px !important;
         }
     }
 
-    @media (max-width: 500px) {
+    @media (max-width: 800px) {
         .friend-list-container {
             overflow: hidden;
         }

package/client/web/src/pages/chat-view/ChatTerminal.vue

@@ -966,7 +966,10 @@ import packageInfo from '../../../package.json'
         border-radius: 7px;
     }
     .shell-msg.revoke {
-        display: none;
+        display: flex;
+        opacity: 1;
+        border: 2px solid var(--color-red);
+        background: rgba(255, 80, 80, 0.08);
     }
     .shell-msg.reply {
         background: var(--color-card-1);

package/client/web/src/pages/options/OptDev.vue

@@ -52,12 +52,25 @@
                     <span>{{ $t('将所有 WebUI 配置恢复为默认值') }}</span>
                 </div>
                 <button
-                    style="width: 100px; font-size: 0.8rem"
                     class="ss-button"
+                    style="width: 100px; font-size: 0.8rem; background: var(--color-red); border-color: var(--color-red); color: #fff"
                     @click="resetDefaults">
                     {{ $t('恢复') }}
                 </button>
             </div>
+            <div class="opt-item">
+                <font-awesome-icon :icon="['fas', 'trash-can']" />
+                <div>
+                    <span>{{ $t('删除数据库全部缓存') }}</span>
+                    <span>{{ $t('清空媒体缓存、内容缓存和数据库历史记录') }}</span>
+                </div>
+                <button
+                    style="width: 100px; font-size: 0.8rem; background: var(--color-red); border-color: var(--color-red); color: #fff"
+                    class="ss-button"
+                    @click="deleteAllCache">
+                    {{ $t('删除') }}
+                </button>
+            </div>
         </div>
     </div>
 </template>
@@ -77,7 +90,7 @@ import packageInfo from '../../../package.json'
         get,
         getRaw,
     } from '../../function/option'
-    import { Connector } from '../../function/connect'
+    import { clearAllCache, Connector } from '../../function/connect'
     import { PopInfo, PopType } from '../../function/base'
     import { isDebugMode } from '../../function/debug'
     import { dispatch } from '../../function/msg'
@@ -151,6 +164,36 @@ import packageInfo from '../../../package.json'
         uiStore.popBoxList.push(popInfo)
     }
 
+    function deleteAllCache() {
+        const popInfo = {
+            title: $t('删除数据库全部缓存'),
+            html: `<span>${$t('确认要删除全部缓存吗？删除后媒体图片、消息内容和数据库历史记录都会被清空。')}</span>`,
+            button: [
+                {
+                    text: $t('确认'),
+                    fun: async () => {
+                        uiStore.popBoxList.shift()
+                        const ok = await clearAllCache()
+                        if (ok) {
+                            new PopInfo().add(PopType.INFO, $t('缓存已全部删除'))
+                            location.reload()
+                        } else {
+                            new PopInfo().add(PopType.ERR, $t('删除缓存失败'))
+                        }
+                    },
+                },
+                {
+                    text: $t('取消'),
+                    master: true,
+                    fun: () => {
+                        uiStore.popBoxList.shift()
+                    },
+                },
+            ],
+        }
+        uiStore.popBoxList.push(popInfo)
+    }
+
     function sendTestWs(event: KeyboardEvent) {
         // 发送测试 WS 消息
         if (event.keyCode === 13 && ws_text.value !== '') {

package/lib/database.d.ts

@@ -0,0 +1,58 @@
+import { Context } from 'koishi';
+import { Config } from './config';
+import { ContactCacheItem, MessageRecord, PinnedState, SelfMessageRecord } from './types';
+import { PluginLogger } from './logger';
+export declare class ChatDatabase {
+    private ctx;
+    private config;
+    private logger;
+    private db;
+    private opened;
+    constructor(ctx: Context, config: Config, logger: PluginLogger);
+    initialize(): Promise<void>;
+    dispose(): Promise<void>;
+    clearAll(): Promise<void>;
+    appendMessage(record: MessageRecord): Promise<void>;
+    upsertSelfMessage(record: SelfMessageRecord): Promise<void>;
+    listSelfMessages(platform: string, selfId: string, channelId: string, limit?: number): Promise<SelfMessageRecord[]>;
+    listSelfMessagesBefore(platform: string, selfId: string, channelId: string, beforeTime: number, limit?: number): Promise<SelfMessageRecord[]>;
+    updateSelfMessageByMessageId(platform: string, selfId: string, _channelId: string, messageId: string, patch: Partial<SelfMessageRecord>): Promise<boolean>;
+    updateMessageRevoked(platform: string, selfId: string, channelId: string, messageId: string, patch: {
+        revoked: boolean;
+        revokedAt: number;
+    }): Promise<boolean>;
+    findSelfForwardContent(platform: string, selfId: string, channelId: string, id: string): Promise<unknown[] | null>;
+    private removeSelfMessageByMessageId;
+    private parseSelfMessage;
+    listMessages(platform: string, selfId: string, channelId: string, limit?: number): Promise<MessageRecord[]>;
+    listMessagesBefore(platform: string, selfId: string, channelId: string, beforeTime: number, limit?: number): Promise<MessageRecord[]>;
+    clearChannel(platform: string, selfId: string, channelId: string): Promise<void>;
+    getPinned(): Promise<PinnedState>;
+    setPinned(state: PinnedState): Promise<void>;
+    getMeta(key: string): Promise<unknown>;
+    setMeta(key: string, value: unknown): Promise<void>;
+    recordMedia(url: string, filePath: string, channelId?: string): Promise<void>;
+    getMediaPath(url: string): Promise<string | undefined>;
+    getAllMedia(): Promise<Array<{
+        filePath: string;
+        channelId: string;
+    }>>;
+    removeMediaByPath(filePath: string): Promise<void>;
+    getContacts(platform: string, selfId: string, type: string): Promise<ContactCacheItem[]>;
+    getContact(platform: string, selfId: string, type: string, id: string): Promise<ContactCacheItem | null>;
+    setContacts(platform: string, selfId: string, type: string, contacts: ContactCacheItem[]): Promise<void>;
+    appendContact(platform: string, selfId: string, type: string, contact: ContactCacheItem): Promise<void>;
+    getContactsLegacy(platform: string, selfId: string, type: string): Promise<ContactCacheItem[]>;
+    getGroupMembers(platform: string, selfId: string, groupId: string): Promise<ContactCacheItem[]>;
+    setGroupMembers(platform: string, selfId: string, groupId: string, members: ContactCacheItem[]): Promise<void>;
+    getGroupMember(platform: string, selfId: string, groupId: string, userId: string): Promise<ContactCacheItem | null>;
+    appendGroupMember(platform: string, selfId: string, groupId: string, member: ContactCacheItem): Promise<void>;
+    getAllContacts(): Promise<Array<{
+        platform: string;
+        selfId: string;
+        type: string;
+        contacts: ContactCacheItem[];
+    }>>;
+    private trimMessages;
+    private trimSelfMessages;
+}