fix:timestamp

This commit is contained in:
手瓜一十雪 2024-02-29 00:48:12 +08:00
parent 8f80da8c5b
commit 66c823e3bd
4 changed files with 14 additions and 14 deletions

View File

@ -4,7 +4,7 @@
"name": "LLOneBot", "name": "LLOneBot",
"slug": "LLOneBot", "slug": "LLOneBot",
"description": "LiteLoaderQQNT的OneBotApi", "description": "LiteLoaderQQNT的OneBotApi",
"version": "3.10.0", "version": "3.10.1",
"thumbnail": "./icon.png", "thumbnail": "./icon.png",
"authors": [ "authors": [
{ {

View File

@ -5,7 +5,7 @@ import {LLOneBotError} from "./types";
export let groups: Group[] = [] export let groups: Group[] = []
export let friends: Friend[] = [] export let friends: Friend[] = []
export let msgHistory: Record<string, RawMessage> = {} // msgId: RawMessage export let msgHistory: Record<string, RawMessage> = {} // msgId: RawMessage
export const version = "3.10.0" export const version = "3.10.1"
export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>(); export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>();
export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>(); export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>();
export let llonebotError: LLOneBotError = { export let llonebotError: LLOneBotError = {

View File

@ -7,23 +7,23 @@ import {
OB11MessageDataType, OB11MessageDataType,
OB11User OB11User
} from "./types"; } from "./types";
import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types'; import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
import {getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data'; import { getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo } from '../common/data';
import {file2base64, getConfigUtil, log} from "../common/utils"; import { file2base64, getConfigUtil, log } from "../common/utils";
import {NTQQApi} from "../ntqqapi/ntcall"; import { NTQQApi } from "../ntqqapi/ntcall";
import {EventType} from "./event/OB11BaseEvent"; import { EventType } from "./event/OB11BaseEvent";
import {encodeCQCode} from "./cqcode"; import { encodeCQCode } from "./cqcode";
export class OB11Constructor { export class OB11Constructor {
static async message(msg: RawMessage): Promise<OB11Message> { static async message(msg: RawMessage): Promise<OB11Message> {
const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig() const { enableLocalFile2Url, ob11: { messagePostFormat } } = getConfigUtil().getConfig()
const message_type = msg.chatType == ChatType.group ? "group" : "private"; const message_type = msg.chatType == ChatType.group ? "group" : "private";
const resMsg: OB11Message = { const resMsg: OB11Message = {
self_id: parseInt(selfInfo.uin), self_id: parseInt(selfInfo.uin),
user_id: parseInt(msg.senderUin), user_id: parseInt(msg.senderUin),
time: parseInt(msg.msgTime) * 1000 || Date.now(), // 13位时间戳毫秒 time: parseInt(msg.msgTime) || Date.now(),
message_id: msg.msgShortId, message_id: msg.msgShortId,
real_id: msg.msgId, real_id: msg.msgId,
message_type: msg.chatType == ChatType.group ? "group" : "private", 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")) { if (message_data.data.url && !message_data.data.url.startsWith(IMAGE_HTTP_HOST + "/download")) {
message_data.data.file = message_data.data.url message_data.data.file = message_data.data.url
} else { } else {
let {err, data} = await file2base64(filePath); let { err, data } = await file2base64(filePath);
if (err) { if (err) {
log("文件转base64失败", filePath, err) log("文件转base64失败", filePath, err)
} else { } else {
message_data.data.file = "base64://" + data message_data.data.file = "base64://" + data
} }
} }
}else{ } else {
message_data.data.file = "file://" + filePath message_data.data.file = "file://" + filePath
} }
} }

View File

@ -1,4 +1,4 @@
import {selfInfo} from "../../common/data"; import { selfInfo } from "../../common/data";
export enum EventType { export enum EventType {
META = "meta_event", META = "meta_event",
@ -10,7 +10,7 @@ export enum EventType {
export abstract class OB11BaseEvent { export abstract class OB11BaseEvent {
time = Date.now(); time = Math.floor(Date.now() / 1000);;
self_id = parseInt(selfInfo.uin); self_id = parseInt(selfInfo.uin);
post_type: EventType; post_type: EventType;
} }