koishi-plugin-chat-patch 6.0.0 → 6.1.0

package/client/web/dist/index.html

@@ -11,7 +11,7 @@
         <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>
+      <script type="module" crossorigin src="./assets/index-DOJoilEy.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-X9hFOAza.css">
     </head>
 

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

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

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

@@ -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

@@ -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/msg.ts

@@ -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

@@ -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

@@ -518,13 +518,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 +648,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,

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>
@@ -2089,6 +2082,8 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     forwardContent: msgBody,
                                     source: 'webui',
                                     sentAt: sentTime,
+                                    timestamp: Math.floor(sentTime / 1000),
+                                    timestampMs: sentTime,
                                     kind: 'forward',
                                 })
                             }
@@ -2996,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/index.js

@@ -5142,6 +5142,12 @@ function encodeKeyPart2(value) {
   return encodeURIComponent(value);
 }
 __name(encodeKeyPart2, "encodeKeyPart");
+function normalizeTimestampMs(value) {
+  const num = Number(value ?? 0);
+  if (!Number.isFinite(num) || num <= 0) return 0;
+  return num > 1e12 ? num : num * 1e3;
+}
+__name(normalizeTimestampMs, "normalizeTimestampMs");
 function decodeKeyPart(value) {
   try {
     return decodeURIComponent(value);
@@ -5160,7 +5166,7 @@ function legacyMessagePrefix(platform, selfId, channelId) {
 __name(legacyMessagePrefix, "legacyMessagePrefix");
 function messageKey(record) {
   const time = String(
-    record.receivedAt ?? record.timestampMs ?? Number(record.timestamp) * 1e3
+    normalizeTimestampMs(record.timestampMs ?? record.timestamp ?? record.receivedAt)
   ).padStart(16, "0");
   return `${messagePrefix(record.platform, record.selfId, record.channelId || "")}${time}:${encodeKeyPart2(record.id || "unknown")}`;
 }
@@ -5170,7 +5176,9 @@ function selfMessagePrefix(platform, selfId, channelId) {
 }
 __name(selfMessagePrefix, "selfMessagePrefix");
 function selfMessageKey(record) {
-  const time = String(record.sentAt).padStart(16, "0");
+  const time = String(
+    normalizeTimestampMs(record.timestampMs ?? record.timestamp ?? record.sentAt)
+  ).padStart(16, "0");
   return `${selfMessagePrefix(record.platform, record.selfId, record.channelId)}${time}:${encodeKeyPart2(record.id || "unknown")}`;
 }
 __name(selfMessageKey, "selfMessageKey");
@@ -5824,7 +5832,7 @@ var _ChatDatabase = class _ChatDatabase {
   extractRecordTime(value) {
     try {
       const parsed = JSON.parse(value);
-      return Number(parsed.receivedAt ?? parsed.timestampMs ?? parsed.timestamp ?? parsed.sentAt ?? 0) || 0;
+      return normalizeTimestampMs(parsed.timestampMs ?? parsed.timestamp ?? parsed.sentAt ?? parsed.receivedAt);
     } catch {
       return 0;
     }
@@ -5890,6 +5898,7 @@ var _Recorder = class _Recorder {
     const user = getObject(body.user);
     const sn = getNumber(body.sn);
     const timestamp = getNumber(body.timestamp) || Date.now();
+    const timestampMs = timestamp > 1e12 ? timestamp : timestamp * 1e3;
     const record = {
       id: getString2(message2.id) || `satori-${sn}`,
       sequence: sn,
@@ -5900,7 +5909,7 @@ var _Recorder = class _Recorder {
       guildId: getString2(guild.id) || void 0,
       userId: getString2(user.id) || void 0,
       timestamp,
-      timestampMs: timestamp,
+      timestampMs,
       receivedAt: Date.now(),
       content: getString2(message2.content) || getString2(message2.raw_message) || void 0,
       elements: Array.isArray(message2.elements) ? message2.elements : void 0,
@@ -7823,6 +7832,7 @@ var _SelfMessageRecorder = class _SelfMessageRecorder {
     const channelType = mode === "private" ? "user" : "group";
     const elements = this.normalizeElements(content);
     const contentText = typeof content === "string" ? content : import_koishi.h.toElementArray(content).join("");
+    const sentAt = Date.now();
     const fingerprint = (0, import_node_crypto3.createHash)("sha256").update([
       platform,
       selfId,
@@ -7842,7 +7852,9 @@ var _SelfMessageRecorder = class _SelfMessageRecorder {
       message: toSegments(elements, (attrs) => this.resolveI18nElement(attrs)),
       forwardId: forwardId(elements),
       forwardContent: toForwardNodes(elements, (attrs) => this.resolveI18nElement(attrs)),
-      sentAt: Date.now(),
+      sentAt,
+      timestamp: Math.floor(sentAt / 1e3),
+      timestampMs: sentAt,
       sequence: ++this.sequence,
       source,
       kind: detectKind(elements),
@@ -7932,6 +7944,7 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
   const webPublic = import_node_path3.default.resolve(__dirname, "..", "client", "web", "public");
   const webIndex = import_node_path3.default.resolve(__dirname, "..", "client", "web", "index.html");
   const uploadDir = import_node_path3.default.resolve(ctx.baseDir, "data", "chat-patch", "upload-media");
+  const mediaDir = import_node_path3.default.resolve(ctx.baseDir, "data", "chat-patch", "media");
   const cacheType = /* @__PURE__ */ __name((type) => type === "user" ? "friend" : type, "cacheType");
   const getVite = /* @__PURE__ */ __name(() => {
     return ctx.console.vite;
@@ -7981,6 +7994,20 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
   const historyChannelCandidates = /* @__PURE__ */ __name((channelId) => {
     return channelId ? [channelId] : [];
   }, "historyChannelCandidates");
+  const messageSortTime = /* @__PURE__ */ __name((item) => {
+    const timestampMs = Number(item.timestampMs ?? 0);
+    if (timestampMs > 0) return timestampMs > 1e12 ? timestampMs : timestampMs * 1e3;
+    const timestamp = Number(item.timestamp ?? 0);
+    if (timestamp > 0) return timestamp * 1e3;
+    return Number(item.receivedAt ?? 0);
+  }, "messageSortTime");
+  const selfMessageSortTime = /* @__PURE__ */ __name((item) => {
+    const timestampMs = Number(item.timestampMs ?? item.sentAt ?? 0);
+    if (timestampMs > 0) return timestampMs > 1e12 ? timestampMs : timestampMs * 1e3;
+    const timestamp = Number(item.timestamp ?? 0);
+    if (timestamp > 0) return timestamp * 1e3;
+    return item.sentAt;
+  }, "selfMessageSortTime");
   const mimeToExt = {
     "audio/mpeg": ".mp3",
     "audio/mp3": ".mp3",
@@ -8105,26 +8132,9 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       localPath: filePath
     };
   });
-  ctx.server.get(`${config.basePath}/api/media`, async (koa) => {
-    const fileName = import_node_path3.default.basename(String(koa.query.file ?? koa.query.name ?? ""));
-    if (!fileName || fileName === "." || fileName === "..") {
-      koa.status = 400;
-      koa.body = { error: "missing media file" };
-      return;
-    }
-    const filePath = import_node_path3.default.resolve(uploadDir, fileName);
-    const root = import_node_path3.default.resolve(uploadDir);
-    if (filePath !== root && !filePath.startsWith(`${root}${import_node_path3.default.sep}`)) {
-      koa.status = 400;
-      koa.body = { error: "invalid media file" };
-      return;
-    }
-    if (!(0, import_node_fs3.existsSync)(filePath) || !(0, import_node_fs3.statSync)(filePath).isFile()) {
-      koa.status = 404;
-      koa.body = { error: "media file not found" };
-      return;
-    }
+  const sendLocalFile = /* @__PURE__ */ __name(async (koa, filePath) => {
     const size = (0, import_node_fs3.statSync)(filePath).size;
+    const fileName = import_node_path3.default.basename(filePath);
     koa.set("Accept-Ranges", "bytes");
     if (fileName.toLowerCase().endsWith(".webm")) {
       koa.type = "audio/webm";
@@ -8164,6 +8174,23 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
     }
     koa.set("Content-Length", String(size));
     koa.body = (0, import_node_fs3.createReadStream)(filePath);
+  }, "sendLocalFile");
+  ctx.server.get(`${config.basePath}/api/media`, async (koa) => {
+    const fileName = import_node_path3.default.basename(String(koa.query.file ?? koa.query.name ?? ""));
+    if (!fileName || fileName === "." || fileName === "..") {
+      koa.status = 400;
+      koa.body = { error: "missing media file" };
+      return;
+    }
+    for (const root of [uploadDir, mediaDir]) {
+      const filePath = import_node_path3.default.resolve(root, fileName);
+      if (filePath !== root && filePath.startsWith(`${root}${import_node_path3.default.sep}`) && (0, import_node_fs3.existsSync)(filePath) && (0, import_node_fs3.statSync)(filePath).isFile()) {
+        await sendLocalFile(koa, filePath);
+        return;
+      }
+    }
+    koa.status = 404;
+    koa.body = { error: "media file not found" };
   });
   ctx.server.get(`${config.basePath}/api/cache/all`, async (koa) => {
     const entries = await database.getAllContacts();
@@ -8215,21 +8242,21 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       if (selfMessages.length) break;
     }
     messages.sort((a, b) => {
-      const timeA = Number(a?.receivedAt ?? a?.timestampMs ?? a?.timestamp ?? 0);
-      const timeB = Number(b?.receivedAt ?? b?.timestampMs ?? b?.timestamp ?? 0);
+      const timeA = messageSortTime(a);
+      const timeB = messageSortTime(b);
       return timeA - timeB;
     });
-    selfMessages.sort((a, b) => a.sentAt - b.sentAt);
+    selfMessages.sort((a, b) => selfMessageSortTime(a) - selfMessageSortTime(b));
     const combined = [];
     for (const item of messages) {
       combined.push({
         kind: "message",
-        time: Number(item?.receivedAt ?? item?.timestampMs ?? item?.timestamp ?? 0),
+        time: messageSortTime(item),
         record: item
       });
     }
     for (const item of selfMessages) {
-      combined.push({ kind: "self", time: item.sentAt, record: item });
+      combined.push({ kind: "self", time: selfMessageSortTime(item), record: item });
     }
     combined.sort((a, b) => a.time - b.time);
     const capped = combined.slice(-limit);
@@ -8255,7 +8282,7 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       messages = Number.isFinite(beforeTime) && beforeTime > 0 ? await database.listSelfMessagesBefore(platform, selfId, candidate, beforeTime, limit) : await database.listSelfMessages(platform, selfId, candidate, limit);
       if (messages.length) break;
     }
-    messages.sort((a, b) => a.sentAt - b.sentAt);
+    messages.sort((a, b) => selfMessageSortTime(a) - selfMessageSortTime(b));
     koa.body = { messages };
   });
   ctx.server.post(`${config.basePath}/api/self-messages`, async (koa) => {
@@ -8275,6 +8302,8 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       forwardId: typeof body.forwardId === "string" ? body.forwardId : void 0,
       forwardContent: Array.isArray(body.forwardContent) ? body.forwardContent : void 0,
       sentAt: typeof body.sentAt === "number" && Number.isFinite(body.sentAt) ? body.sentAt : Date.now(),
+      timestamp: typeof body.timestamp === "number" && Number.isFinite(body.timestamp) ? body.timestamp : void 0,
+      timestampMs: typeof body.timestampMs === "number" && Number.isFinite(body.timestampMs) ? body.timestampMs : void 0,
       sequence: typeof body.sequence === "number" && Number.isFinite(body.sequence) ? body.sequence : 0,
       source: body.source === "plugin" ? "plugin" : "webui",
       kind: typeof body.kind === "string" ? body.kind : "text",
@@ -8286,6 +8315,7 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       koa.body = { error: "missing self-message params" };
       return;
     }
+    const sentAt = payload.sentAt ?? Date.now();
     const record = {
       id: payload.id || `web-${Date.now()}-${Math.random().toString(36).slice(2)}`,
       platform: payload.platform,
@@ -8299,7 +8329,9 @@ function registerWeb(ctx, config, database, contactCache, media, logger) {
       message: payload.message,
       forwardId: payload.forwardId,
       forwardContent: payload.forwardContent,
-      sentAt: payload.sentAt ?? Date.now(),
+      sentAt,
+      timestamp: payload.timestamp ?? Math.floor(sentAt / 1e3),
+      timestampMs: payload.timestampMs ?? sentAt,
       sequence: payload.sequence ?? 0,
       source: payload.source ?? "webui",
       kind: payload.kind ?? "text",