From 66c823e3bdd2733e026718bd35fd2299ac34df11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Thu, 29 Feb 2024 00:48:12 +0800 Subject: [PATCH] fix:timestamp --- manifest.json | 2 +- src/common/data.ts | 2 +- src/onebot11/constructor.ts | 20 ++++++++++---------- src/onebot11/event/OB11BaseEvent.ts | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/manifest.json b/manifest.json index 0e404e9..feb9346 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "LLOneBot", "slug": "LLOneBot", "description": "LiteLoaderQQNT的OneBotApi", - "version": "3.10.0", + "version": "3.10.1", "thumbnail": "./icon.png", "authors": [ { diff --git a/src/common/data.ts b/src/common/data.ts index 55fc6a0..004d4f6 100644 --- a/src/common/data.ts +++ b/src/common/data.ts @@ -5,7 +5,7 @@ import {LLOneBotError} from "./types"; export let groups: Group[] = [] export let friends: Friend[] = [] export let msgHistory: Record = {} // msgId: RawMessage -export const version = "3.10.0" +export const version = "3.10.1" export let groupNotifies: Map = new Map(); export let friendRequests: Map = new Map(); export let llonebotError: LLOneBotError = { diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts index 0616842..1ffcf35 100644 --- a/src/onebot11/constructor.ts +++ b/src/onebot11/constructor.ts @@ -7,23 +7,23 @@ import { OB11MessageDataType, OB11User } from "./types"; -import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types'; -import {getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data'; -import {file2base64, getConfigUtil, log} from "../common/utils"; -import {NTQQApi} from "../ntqqapi/ntcall"; -import {EventType} from "./event/OB11BaseEvent"; -import {encodeCQCode} from "./cqcode"; +import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types'; +import { getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo } from '../common/data'; +import { file2base64, getConfigUtil, log } from "../common/utils"; +import { NTQQApi } from "../ntqqapi/ntcall"; +import { EventType } from "./event/OB11BaseEvent"; +import { encodeCQCode } from "./cqcode"; export class OB11Constructor { static async message(msg: RawMessage): Promise { - const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig() + const { enableLocalFile2Url, ob11: { messagePostFormat } } = getConfigUtil().getConfig() const message_type = msg.chatType == ChatType.group ? "group" : "private"; const resMsg: OB11Message = { self_id: parseInt(selfInfo.uin), user_id: parseInt(msg.senderUin), - time: parseInt(msg.msgTime) * 1000 || Date.now(), // 13位时间戳,毫秒 + time: parseInt(msg.msgTime) || Date.now(), message_id: msg.msgShortId, real_id: msg.msgId, message_type: msg.chatType == ChatType.group ? "group" : "private", @@ -148,14 +148,14 @@ export class OB11Constructor { if (message_data.data.url && !message_data.data.url.startsWith(IMAGE_HTTP_HOST + "/download")) { message_data.data.file = message_data.data.url } else { - let {err, data} = await file2base64(filePath); + let { err, data } = await file2base64(filePath); if (err) { log("文件转base64失败", filePath, err) } else { message_data.data.file = "base64://" + data } } - }else{ + } else { message_data.data.file = "file://" + filePath } } diff --git a/src/onebot11/event/OB11BaseEvent.ts b/src/onebot11/event/OB11BaseEvent.ts index af636d1..850b6fa 100644 --- a/src/onebot11/event/OB11BaseEvent.ts +++ b/src/onebot11/event/OB11BaseEvent.ts @@ -1,4 +1,4 @@ -import {selfInfo} from "../../common/data"; +import { selfInfo } from "../../common/data"; export enum EventType { META = "meta_event", @@ -10,7 +10,7 @@ export enum EventType { export abstract class OB11BaseEvent { - time = Date.now(); + time = Math.floor(Date.now() / 1000);; self_id = parseInt(selfInfo.uin); post_type: EventType; } \ No newline at end of file