npm - koishi-plugin-chat-patch - Versions diffs - 6.0.0 → 6.1.1 - Mend

koishi-plugin-chat-patch 6.0.0 → 6.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/client/web/dist/assets/Chat-BduEIlJM.js +34 -0
package/client/web/dist/assets/{Chat-D4tCqRrO.css → Chat-DgkvjRIh.css} +1 -1
package/client/web/dist/assets/{MsgBody-BaoDyXUz.js → MsgBody-CVtXorvl.js} +1 -1
package/client/web/dist/assets/MsgBody.vue_vue_type_script_setup_true_lang-D_70Txdf.js +67 -0
package/client/web/dist/assets/{index-X9hFOAza.css → index-BW47RWcA.css} +1 -1
package/client/web/dist/assets/{index--7-eCx0r.js → index-N2_GDY3v.js} +5 -8
package/client/web/dist/index.html +2 -2
package/client/web/src/assets/css/chat.css +24 -2
package/client/web/src/assets/l10n/zh-CN.po +0 -3
package/client/web/src/components/MsgBody.vue +29 -20
package/client/web/src/function/connect.ts +12 -6
package/client/web/src/function/custom-element.ts +31 -0
package/client/web/src/function/msg.ts +2 -0
package/client/web/src/function/satori-model.ts +2 -0
package/client/web/src/function/utils/msgUtil.ts +66 -44
package/client/web/src/pages/Chat.vue +139 -15
package/lib/index.js +91 -31
package/lib/types.d.ts +142 -0
package/package.json +1 -1
package/src/database.ts +27 -19
package/src/recorder.ts +2 -1
package/src/self-message.ts +4 -1
package/src/types.ts +4 -0
package/src/web-error-filter.ts +30 -0
package/src/web.ts +107 -77
package/client/web/dist/assets/Chat-BkRnAj_r.js +0 -28
package/client/web/dist/assets/MsgBody.vue_vue_type_script_setup_true_lang-CgpEB8mj.js +0 -67

package/client/web/dist/index.html CHANGED Viewed

@@ -11,8 +11,8 @@
         <link rel="stylesheet" href="./bcui/css/style.css">
         <link rel="stylesheet" href="./bcui/css/color-light.css">
         <link rel="stylesheet" href="./css/append-light.css">
-      <script type="module" crossorigin src="./assets/index--7-eCx0r.js"></script>
-      <link rel="stylesheet" crossorigin href="./assets/index-X9hFOAza.css">
+      <script type="module" crossorigin src="./assets/index-N2_GDY3v.js"></script>
+      <link rel="stylesheet" crossorigin href="./assets/index-BW47RWcA.css">
     </head>
     <body>

package/client/web/src/assets/css/chat.css CHANGED Viewed

@@ -180,12 +180,21 @@ input {
     border-radius: 7px;
 }
 .chat-pan > div.more > div:nth-child(2) > div:first-child {
-    margin-right: 20px;
+    display: flex;
+    flex: 0 0 auto;
+    gap: 8px;
+    margin-right: 12px;
+    background: transparent;
+}
+.chat-pan > div.more > div:nth-child(2) > div:first-child > .send-tool-button {
+    background: var(--color-card-1);
+    border-radius: 7px;
     cursor: pointer;
     height: 50px;
+    margin: 0;
     width: 50px;
 }
-.chat-pan > div.more > div:nth-child(2) > div:first-child > svg {
+.chat-pan > div.more > div:nth-child(2) > div:first-child > .send-tool-button > svg {
     color: var(--color-font-1);
     margin: 15px;
     height: 20px;
@@ -225,6 +234,19 @@ input {
     resize: none;
     border: 0;
 }
+.chat-pan > div.more > div:nth-child(2) > div > form.custom-element-form > input.custom-element-type-input {
+    flex: 0 1 18%;
+    width: 18%;
+    min-width: 72px;
+    max-width: 130px;
+    margin-right: 8px;
+}
+.chat-pan > div.more > div:nth-child(2) > div > form.custom-element-form > input.custom-element-content-input,
+.chat-pan > div.more > div:nth-child(2) > div > form.custom-element-form > textarea.custom-element-content-input {
+    flex: 1 1 auto;
+    width: auto;
+    min-width: 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);

package/client/web/src/assets/l10n/zh-CN.po CHANGED Viewed

@@ -1047,9 +1047,6 @@ msgstr ""
 msgid "应用内通知和系统通知"
 msgstr ""
-msgid "成员设置"
-msgstr ""
 msgid "成员信息"
 msgstr ""

package/client/web/src/components/MsgBody.vue CHANGED Viewed

@@ -103,17 +103,17 @@
                             class="msg-md" />
                         <img v-else-if="item.type == 'image' && item.file == 'marketface'"
                             :class=" imgStyle(data.message.length, Number(index), true) + ' msg-mface'"
-                            :src="item.url"
+                            :src="getImageUrl(item)"
                             :alt="item.summary"
                             @load="imageLoaded"
-                            @click="preImgClick(item.url || item.file)"
+                            @click="preImgClick(getImageUrl(item))"
                             @error="imgLoadFail">
                         <img v-else-if="item.type == 'mface'"
                             :class=" imgStyle(data.message.length, Number(index), true) + ' msg-mface'"
-                            :src="item.url"
+                            :src="getImageUrl(item)"
                             :alt="item.summary"
                             @load="imageLoaded"
-                            @click="preImgClick(item.url || item.file)"
+                            @click="preImgClick(getImageUrl(item))"
                             @error="imgLoadFail">
                         <template v-else-if="item.type == 'image'">
                             <div v-show="shouldShowImagePlaceholder(item, Number(index))"
@@ -121,21 +121,21 @@
                                 :class="imgStyle(data.message.length, Number(index), isFace(item)) + ' msg-img-placeholder'"
                                 @click="loadImage(item, Number(index), $event)">
                                 <font-awesome-icon
-                                    :icon="['fas', imageLoading(getImageKey(Number(index), item.url)) ? 'spinner' : 'image']"
-                                    :spin="imageLoading(getImageKey(Number(index), item.url))" />
+                                    :icon="['fas', imageLoading(getImageKey(Number(index), getImageUrl(item))) ? 'spinner' : 'image']"
+                                    :spin="imageLoading(getImageKey(Number(index), getImageUrl(item)))" />
                                 <span>
-                                    {{ imageLoading(getImageKey(Number(index), item.url)) ? $t('加载中') : $t('点击加载图片') }}
+                                    {{ imageLoading(getImageKey(Number(index), getImageUrl(item))) ? $t('加载中') : $t('点击加载图片') }}
                                 </span>
                             </div>
                             <img v-show="!shouldShowImagePlaceholder(item, Number(index))"
                                 :title="(!item.summary || item.summary == '') ? $t('预览图片') : item.summary"
                                 :alt="$t('图片')"
                                 :class=" imgStyle(data.message.length, Number(index), isFace(item))"
-                                :src="getImgSrc(item.url)"
+                                :src="getImgSrc(getImageUrl(item))"
                                 data-type="image"
                                 @load="imageLoaded"
                                 @error="imgLoadFail"
-                                @click="imgClick(item.url || item.file, $event)">
+                                @click="imgClick(getImageUrl(item), $event)">
                         </template>
                         <template v-else-if="item.type == 'face'">
                             <EmojiFace :emoji="Emoji.get(Number(item.id))" class="msg-face" />
@@ -173,7 +173,8 @@
                             <div v-if="data.fileView && Object.keys(data.fileView).length > 0"
                                 class="file-view">
                                 <img v-if="['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(data.fileView.ext)"
-                                    :src="getMediaSrc(data.fileView.url)">
+                                    :src="getMediaSrc(data.fileView.url)"
+                                    @click="preImgClick(getMediaSrc(data.fileView.url))">
                                 <video v-else-if="['mp4', 'avi', 'mkv', 'flv'].includes(data.fileView.ext)"
                                     playsinline controls muted
                                     autoplay>
@@ -570,11 +571,16 @@ async function loadCachedImages() {
     const selfId = authStore.loginInfo?.uin
     if (!selfId) return
     for (const seg of data.message) {
-        if (seg.type !== 'image' || !seg.url) continue
-        await loadCachedImage(seg.url)
+        const url = getImageUrl(seg)
+        if (seg.type !== 'image' || !url) continue
+        await loadCachedImage(url)
     }
 }
+function getImageUrl(item: { url?: string; file?: string }): string {
+    return String(item?.url || item?.file || '')
+}
 async function loadCachedImage(url: string) {
     if (resolvedImages.value[url]) return resolvedImages.value[url]
@@ -593,6 +599,7 @@ async function loadCachedImage(url: string) {
 }
 function getImgSrc(url: string): string {
+    if (!url) return ''
     if (url.startsWith('base64://')) {
         return `data:image/png;base64,${url.slice(9)}`
     }
@@ -617,11 +624,11 @@ function imageLoading(key: string) {
     return pendingImageLoads.value[key] === true
 }
-function shouldShowImagePlaceholder(item: { type: string, url: string }, index: number) {
+function shouldShowImagePlaceholder(item: { type: string, url?: string, file?: string }, index: number) {
     if (item.type !== 'image') return false
     if (settingsStore.sysConfig.opt_no_auto_load_image !== true) return false
-    return manualImageLoads.value[getImageKey(index, item.url)] !== true
+    return manualImageLoads.value[getImageKey(index, getImageUrl(item))] !== true
 }
 function getAtClass(who: number | string) {
@@ -717,8 +724,9 @@ function buildMessageImageList(): Img | undefined {
     const collect = (msg: any) => {
         if (!Array.isArray(msg?.message)) return
         for (const item of msg.message) {
-            if (item?.type === 'image' && item?.file !== 'marketface' && item?.url) {
-                urls.push(String(item.url))
+            if (item?.type === 'image' && item?.file !== 'marketface') {
+                const url = getImageUrl(item)
+                if (url) urls.push(url)
             }
         }
     }
@@ -729,15 +737,16 @@ function buildMessageImageList(): Img | undefined {
     return Img.fromList([...new Set(urls)])
 }
-async function loadImage(item: { url: string }, index: number, _event?: MouseEvent) {
+async function loadImage(item: { url?: string; file?: string }, index: number, _event?: MouseEvent) {
     if (props.selecting) return
-    const key = getImageKey(index, item.url)
+    const url = getImageUrl(item)
+    const key = getImageKey(index, url)
     if (manualImageLoads.value[key] || pendingImageLoads.value[key]) return
     pendingImageLoads.value[key] = true
     try {
         if (data._from_local_db) {
-            await loadCachedImage(item.url)
+            await loadCachedImage(url)
         }
         manualImageLoads.value[key] = true
     } finally {
@@ -1252,7 +1261,7 @@ async function openMerge(event?: MouseEvent) {
                 imgList.push({
                     index: index,
                     message_id: item.message_id,
-                    img_url: msg.url,
+                    img_url: msg.url || msg.file,
                 })
                 index++
             }

package/client/web/src/function/connect.ts CHANGED Viewed

@@ -1303,6 +1303,8 @@ export interface SaveSelfMessagePayload {
   forwardId?: string
   forwardContent?: unknown[]
   sentAt?: number
+  timestamp?: number
+  timestampMs?: number
   source?: 'webui' | 'bot' | 'plugin'
   kind?: string
 }
@@ -1330,6 +1332,8 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
   const selfId = getString(obj.selfId)
   const channelId = getString(obj.channelId)
   const sentAt = Number(obj.sentAt ?? Date.now())
+  const timestamp = Number(obj.timestamp) || Math.floor(sentAt / 1000)
+  const timestampMs = Number(obj.timestampMs ?? sentAt)
   const messageId = getString(obj.messageId)
   const localId = getString(obj.id) || `self-${sentAt}`
   // 只按记录里的显式 channelType 判断，不根据频道 ID 前缀推断
@@ -1399,10 +1403,11 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
     channel_id: channelId,
     guild_id: guildId || undefined,
     target_id: selfId,
-    time: Math.floor(sentAt / 1000) || Math.floor(Date.now() / 1000),
-    local_time: sentAt,
-    timestamp_ms: sentAt,
-    time_ms: sentAt,
+    timestamp,
+    time: timestamp,
+    local_time: timestampMs,
+    timestamp_ms: timestampMs,
+    time_ms: timestampMs,
     sender: {
       user_id: selfId,
       nickname: getString(login?.name) || selfId,
@@ -1469,8 +1474,9 @@ export async function loadChatHistoryFromCache(params: {
     const raw = getObject(recordObj.raw)
     const msg = satoriEventToOneBot(raw, params.platform)
     if (!msg || !msg.message_id) continue
-    const localTime = Number(recordObj.receivedAt ?? recordObj.timestampMs ?? recordObj.timestamp ?? 0)
-    if (localTime) {
+    const rawTime = Number(recordObj.timestampMs ?? recordObj.timestamp ?? recordObj.receivedAt ?? 0)
+    const localTime = rawTime > 1e12 ? rawTime : rawTime * 1000
+    if (localTime > 0) {
       msg.local_time = localTime
       msg.timestamp_ms = localTime
       msg.time_ms = localTime

package/client/web/src/function/custom-element.ts ADDED Viewed

@@ -0,0 +1,31 @@
+import h from '@satorijs/element'
+// 自定义消息元素：使用 Satori 元素工厂，保留命名空间扩展类型。
+const ELEMENT_TYPE_PATTERN = /^[a-z][a-z0-9_:-]*$/i
+type CustomElement = ReturnType<typeof h>
+/**
+ * 将输入的类型和内容转换为 Satori 元素。
+ * 空内容不生成元素，避免发送无意义的空消息。
+ */
+export function buildCustomElement(type: string, content: string): CustomElement | null {
+    const elementType = type.trim()
+    const elementContent = content.trim()
+    if (!ELEMENT_TYPE_PATTERN.test(elementType) || elementContent.length === 0) return null
+    const normalizedType = elementType.toLowerCase()
+    if (normalizedType === 'text') return h.text(content)
+    if (normalizedType === 'img' || normalizedType === 'image') return h.img(elementContent)
+    if (normalizedType === 'file') return h.file(elementContent)
+    if (normalizedType === 'video') return h.video(elementContent)
+    if (normalizedType === 'audio' || normalizedType === 'record') return h.audio(elementContent)
+    if (normalizedType === 'json' || normalizedType === 'xml') {
+        return h(normalizedType, { data: elementContent })
+    }
+    if (normalizedType === 'markdown') {
+        return h('markdown', elementContent)
+    }
+    return h(elementType, elementContent)
+}

package/client/web/src/function/msg.ts CHANGED Viewed

@@ -1039,6 +1039,8 @@ const msgFunctions = {
                     message: Array.isArray(sentItem?.message) ? sentItem.message : [],
                     source: 'webui',
                     sentAt: Number(sentItem?.local_time ?? sentItem?.timestamp_ms ?? Date.now()),
+                    timestamp: Number(sentItem?.time) || Math.floor(Date.now() / 1000),
+                    timestampMs: Number(sentItem?.local_time ?? sentItem?.timestamp_ms ?? Date.now()),
                     kind: String(sentItem?.message?.[0]?.type ?? 'text'),
                 })
             }

package/client/web/src/function/satori-model.ts CHANGED Viewed

@@ -456,6 +456,7 @@ export function satoriEventToOneBot(
     self_id: selfId,
     platform,
     sn: getNumber(event.sn),
+    timestamp: Math.floor(normalizeTimestampMs(event.timestamp) / 1000),
     timestamp_ms: getNumber(event.timestamp) ? normalizeTimestampMs(event.timestamp) : 0,
     time: Math.floor(normalizeTimestampMs(event.timestamp) / 1000),
     message_seq: getNumber(event.sn),
@@ -733,6 +734,7 @@ function messageListFromResponse(data: unknown): unknown[] {
     return {
       message_id: getString(message.id),
       sn: getNumber(message.sn),
+      timestamp: Math.floor(normalizeTimestampMs(message.timestamp) / 1000),
       timestamp_ms: getNumber(message.timestamp) ? normalizeTimestampMs(message.timestamp) : 0,
       time: Math.floor(normalizeTimestampMs(message.timestamp) / 1000),
       message_seq: getNumber(message.sn) || getNumber(message.seq),

package/client/web/src/function/utils/msgUtil.ts CHANGED Viewed

@@ -459,12 +459,12 @@ export function parseCQ(data: any) {
 * @param preShow 是否消息预显
 * @param echo 回显的事件名
 */
-function parsePreviewMarkup(source: string): MsgItemElem[] {
-    const result: MsgItemElem[] = []
-    const tagPattern = /<(img|image|face|mface|file|audio|video|at|quote|sharp)\s+([^>]*?)\/?>/gi
-    let last = 0
-    let match: RegExpExecArray | null
-    while ((match = tagPattern.exec(source)) !== null) {
+function parsePreviewMarkup(source: string): MsgItemElem[] {
+    const result: MsgItemElem[] = []
+    const tagPattern = /<([a-z][\w:-]*)\s+([^>]*?)\/?>/gi
+    let last = 0
+    let match: RegExpExecArray | null
+    while ((match = tagPattern.exec(source)) !== null) {
         if (match.index > last) {
             result.push({ type: 'text', text: source.slice(last, match.index) })
         }
@@ -475,20 +475,28 @@ function parsePreviewMarkup(source: string): MsgItemElem[] {
         const name = attrs.match(/name\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
             ?? attrs.match(/name\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
             ?? ''
-        const id = attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
-            ?? attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
-            ?? ''
-        const tag = String(match[1] ?? '').toLowerCase()
-        if (tag === 'at') {
-            result.push({ type: 'at', qq: id, text: name || id })
-        } else if (tag === 'quote') {
-            result.push({ type: 'reply', id })
-        } else if (tag === 'sharp') {
-            result.push({ type: 'text', text: name ? `#${name}` : `#${id}` })
-        } else {
-            const type = tag === 'file'
-                ? 'file'
-                : tag === 'audio'
+        const id = attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/id\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const content = attrs.match(/content\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/content\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const data = attrs.match(/data\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[1]
+            ?? attrs.match(/data\s*=\s*(?:"([^"]*)"|'([^']*)')/i)?.[2]
+            ?? ''
+        const tag = String(match[1] ?? '').toLowerCase()
+        if (tag === 'at') {
+            result.push({ type: 'at', qq: id, text: name || id })
+        } else if (tag === 'quote') {
+            result.push({ type: 'reply', id })
+        } else if (tag === 'sharp') {
+            result.push({ type: 'text', text: name ? `#${name}` : `#${id}` })
+        } else if (tag === 'text') {
+            result.push({ type: 'text', text: content })
+        } else if (['img', 'image', 'face', 'mface', 'file', 'audio', 'video'].includes(tag)) {
+            const type = tag === 'file'
+                ? 'file'
+                : tag === 'audio'
                     ? 'record'
                     : tag === 'video'
                         ? 'video'
@@ -497,9 +505,17 @@ function parsePreviewMarkup(source: string): MsgItemElem[] {
                 type,
                 file: src,
                 url: src,
-                ...(name ? { name } : {}),
-            })
-        }
+                ...(name ? { name } : {}),
+            })
+        } else {
+            result.push({
+                type: tag,
+                ...(src ? { src, file: src, url: src } : {}),
+                ...(name ? { name } : {}),
+                ...(content ? { content } : {}),
+                ...(data ? { data } : {}),
+            })
+        }
         last = match.index + match[0].length
     }
     if (last < source.length) {
@@ -518,13 +534,24 @@ function getBase64Source(item: any): string {
     return ''
 }
-function isBase64Source(source: string): boolean {
-    return source.startsWith('base64://') || source.startsWith('data:')
-}
-export function getLocalMediaUrl(value: string): string {
-    if (!value) return value
-    const isLocalPath = value.startsWith('file:') ||
+function isBase64Source(source: string): boolean {
+    return source.startsWith('base64://') || source.startsWith('data:')
+}
+function toPreviewImageSrc(item: any): string {
+    const source = String(item?.url ?? item?.file ?? '')
+    if (source.startsWith('base64://')) {
+        return `data:image/png;base64,${source.slice(9)}`
+    }
+    if (source.startsWith('data:') || source.startsWith('http:') || source.startsWith('https:')) {
+        return source
+    }
+    return getLocalMediaUrl(source)
+}
+export function getLocalMediaUrl(value: string): string {
+    if (!value) return value
+    const isLocalPath = value.startsWith('file:') ||
         /^[a-z]:[\\/]/i.test(value) ||
         value.startsWith('\\\\')
     if (!isLocalPath) return value
@@ -637,20 +664,15 @@ export async function sendMsgRaw(
         const preShowMsg = typeof msg === 'string'
             ? parsePreviewMarkup(msg)
             : JSON.parse(JSON.stringify(msg));
-        preShowMsg.forEach((item: any) => {
-            // 对 base64 图片做特殊处理
-            if (item.type == 'image') {
-                if (item.file.startsWith('base64://')) {
-                    const b64Str = (item.file as string).substring(9)
-                    item.url = 'data:image/png;base64,' + b64Str
-                } else {
-                    item.url = item.file
-                }
-            }
-            if (item.type == 'record' && item.file.startsWith('base64://')) {
-                const b64Str = (item.file as string).substring(9)
-                item.url = 'data:audio/webm;base64,' + b64Str
-            }
+        preShowMsg.forEach((item: any) => {
+            // 对 base64 图片做特殊处理
+            if (item.type == 'image') {
+                item.url = toPreviewImageSrc(item)
+            }
+            if (item.type == 'record' && String(item?.file ?? '').startsWith('base64://')) {
+                const b64Str = (item.file as string).substring(9)
+                item.url = 'data:audio/webm;base64,' + b64Str
+            }
         })
         const showMsg = {
             revoke: true,