GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: some id(int and string) compatibility

Browse Source
This commit is contained in:
linyuchen 2024-02-16 15:54:07 +08:00
parent 0eeba1d29e
commit 963aad1510
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

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

2
src/main/main.ts
View File

@ -63,7 +63,7 @@ function onLoad() {
if (debug) { if (debug) {
msg.raw = message; msg.raw = message;
} }
if (msg.user_id == selfInfo.uin && !reportSelfMessage) { if (msg.user_id.toString() == selfInfo.uin && !reportSelfMessage) {
return return
} }
postMsg(msg); postMsg(msg);

18
src/onebot11/constructor.ts
View File

@ -18,14 +18,14 @@ export class OB11Constructor {
const {enableBase64} = getConfigUtil().getConfig() const {enableBase64} = 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: selfInfo.uin, self_id: parseInt(selfInfo.uin),
user_id: msg.senderUin, user_id: parseInt(msg.senderUin),
time: parseInt(msg.msgTime) || 0, time: parseInt(msg.msgTime) || 0,
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",
sender: { sender: {
user_id: msg.senderUin, user_id: parseInt(msg.senderUin),
nickname: msg.sendNickName, nickname: msg.sendNickName,
card: msg.sendMemberName || "", card: msg.sendMemberName || "",
}, },
@ -37,7 +37,7 @@ export class OB11Constructor {
} }
if (msg.chatType == ChatType.group) { if (msg.chatType == ChatType.group) {
resMsg.sub_type = "normal" resMsg.sub_type = "normal"
resMsg.group_id = msg.peerUin resMsg.group_id = parseInt(msg.peerUin)
const member = await getGroupMember(msg.peerUin, msg.senderUin); const member = await getGroupMember(msg.peerUin, msg.senderUin);
if (member) { if (member) {
resMsg.sender.role = OB11Constructor.groupMemberRole(member.role); resMsg.sender.role = OB11Constructor.groupMemberRole(member.role);
@ -135,7 +135,7 @@ export class OB11Constructor {
static friend(friend: User): OB11User { static friend(friend: User): OB11User {
return { return {
user_id: friend.uin, user_id: parseInt(friend.uin),
nickname: friend.nick, nickname: friend.nick,
remark: friend.remark remark: friend.remark
} }
@ -144,7 +144,7 @@ export class OB11Constructor {
static selfInfo(selfInfo: SelfInfo): OB11User { static selfInfo(selfInfo: SelfInfo): OB11User {
return { return {
user_id: selfInfo.uin, user_id: parseInt(selfInfo.uin),
nickname: selfInfo.nick nickname: selfInfo.nick
} }
} }
@ -163,8 +163,8 @@ export class OB11Constructor {
static groupMember(group_id: string, member: GroupMember): OB11GroupMember { static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
return { return {
group_id, group_id: parseInt(group_id),
user_id: member.uin, user_id: parseInt(member.uin),
nickname: member.nick, nickname: member.nick,
card: member.cardName card: member.cardName
} }
@ -177,7 +177,7 @@ export class OB11Constructor {
static group(group: Group): OB11Group { static group(group: Group): OB11Group {
return { return {
group_id: group.groupCode, group_id: parseInt(group.groupCode),
group_name: group.groupName group_name: group.groupName
} }
} }

2
src/onebot11/server.ts
View File

@ -110,7 +110,7 @@ export function startWSServer(port: number) {
export function postMsg(msg: OB11Message) { export function postMsg(msg: OB11Message) {
const {reportSelfMessage} = getConfigUtil().getConfig() const {reportSelfMessage} = getConfigUtil().getConfig()
if (!reportSelfMessage) { if (!reportSelfMessage) {
if (msg.user_id == selfInfo.uin) { if (msg.user_id.toString() == selfInfo.uin) {
return return
} }
} }

16
src/onebot11/types.ts
View File

@ -2,7 +2,7 @@ import { AtType } from "../ntqqapi/types";
import { RawMessage } from "../ntqqapi/types"; import { RawMessage } from "../ntqqapi/types";
export interface OB11User{ export interface OB11User{
user_id: string; user_id: number;
nickname: string; nickname: string;
remark?: string remark?: string
} }
@ -20,8 +20,8 @@ export enum OB11GroupMemberRole{
} }
export interface OB11GroupMember { export interface OB11GroupMember {
group_id: string group_id: number
user_id: string user_id: number
nickname: string nickname: string
card?: string card?: string
sex?: OB11UserSex sex?: OB11UserSex
@ -34,14 +34,14 @@ export interface OB11GroupMember {
} }
export interface OB11Group{ export interface OB11Group{
group_id: string group_id: number
group_name: string group_name: string
member_count?: number member_count?: number
max_member_count?: number max_member_count?: number
} }
interface OB11Sender { interface OB11Sender {
user_id: string, user_id: number,
nickname: string, nickname: string,
sex?: OB11UserSex, sex?: OB11UserSex,
age?: number, age?: number,
@ -56,12 +56,12 @@ export enum OB11MessageType {
} }
export interface OB11Message { export interface OB11Message {
self_id?: string, self_id?: number,
time: number, time: number,
message_id: number, message_id: number,
real_id: string, real_id: string,
user_id: string, user_id: number,
group_id?: string, group_id?: number,
message_type: "private" | "group", message_type: "private" | "group",
sub_type?: "friend" | "group" | "normal", sub_type?: "friend" | "group" | "normal",
sender: OB11Sender, sender: OB11Sender,